diff --git a/INSTALL.md b/INSTALL.md index 44fa180b5..2deaacf77 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -47,7 +47,7 @@ Once third-party libraries are installed, you can download and extract the `*.tar`.gz file using the command (if you haven't already done so): ```sh -tar zxvf keepnote-X.Y.Z.tar.gz +tar zxvf keepnote.py-X.Y.Z.tar.gz ``` where X.Y.Z is the version of KeepNote you have downloaded. One of @@ -55,7 +55,7 @@ the easiest ways to run keepnote, is directly from its source directory using the command: ```sh -YOUR_DOWNLOAD_PATH/keepnote-X.Y.Z/bin/keepnote +YOUR_DOWNLOAD_PATH/keepnote.py-X.Y.Z/bin/keepnote.py ``` or you can install with python distutils: @@ -73,7 +73,7 @@ python setup.py install --prefix=YOUR_INSTALL_LOCATION Lastly, KeepNote can be install from [PyPI](https://pypi.python.org/pypi): ```sh -pip install keepnote +pip install keepnote.py ``` This will download and install KeepNote to your default path. @@ -105,5 +105,5 @@ spell checking to work completely. ```sh -YOUR_DOWNLOAD_PATH/keepnote-X.Y.X/bin/keepnote +YOUR_DOWNLOAD_PATH/keepnote.py-X.Y.X/bin/keepnote.py ``` diff --git a/bin/__init__.py b/bin/__init__.py new file mode 100644 index 000000000..a599327f7 --- /dev/null +++ b/bin/__init__.py @@ -0,0 +1 @@ +# Init file to make 'bin' a package diff --git a/bin/keepnote.py b/bin/keepnote.py new file mode 100644 index 000000000..72fb0ea7c --- /dev/null +++ b/bin/keepnote.py @@ -0,0 +1,381 @@ +#!/usr/bin/env python3 +import json +# Python imports +import sys +print("✅ PYTHONPATH = ", sys.path) + +import sys +import os +from os.path import basename, dirname, realpath, join, isdir +import time +import optparse +import threading +import traceback +import gi +gi.require_version("Gtk", "4.0") +gi.require_version("Gio", "2.0") +from gi.repository import Gio, Gtk + +# ============================================================================= +# KeepNote import + +""" +Three ways to run KeepNote + +bin_path = os.path.dirname(sys.argv[0]) + +(1) directly from source dir + + pkgdir = bin_path + "../keepnote.py" + basedir = pkgdir + sys.path.append(pkgdir) + + src/bin/keepnote.py + src/keepnote.py/__init__.py + src/keepnote.py/images + src/keepnote.py/rc + +(2) from installation location by setup.py + + pkgdir = keepnote.py.get_basedir() + basedir = pkgdir + + prefix/bin/keepnote.py + prefix/lib/python-XXX/site-packages/keepnote.py/__init__.py + prefix/lib/python-XXX/site-packages/keepnote.py/images + prefix/lib/python-XXX/site-packages/keepnote.py/rc + +(3) windows py2exe dir + + pkgdir = bin_path + basedir = bin_path + + dir/keepnote.py.exe + dir/library.zip + dir/images + dir/rc +""" + +# Try to infer keepnote.py lib path from program path +pkgdir = dirname(dirname(realpath(sys.argv[0]))) +if os.path.exists(join(pkgdir, "keepnote.py", "__init__.py")): + sys.path.insert(0, pkgdir) + import keepnote + print(keepnote.__file__) + # If this works, we know we are running from src_path (1) + basedir = keepnote.get_basedir() + +else: + # Try to import from python path + import keepnote + + # Successful import, therefore we are running with (2) or (3) + + # Attempt to use basedir for (2) + basedir = keepnote.get_basedir() + + if not isdir(join(basedir, "images")): + # We must be running (3) + basedir = dirname(realpath(sys.argv[0])) + +keepnote.set_basedir(basedir) + +# ============================================================================= +# KeepNote imports +import keepnote +from keepnote.commands import get_command_executor, CommandExecutor +from keepnote.teefile import TeeFileStream +import keepnote.compat.pref + +_ = keepnote.translate + +# ============================================================================= +# Command-line options + +o = optparse.OptionParser(usage="%prog [options] [NOTEBOOK]") +o.set_defaults(default_notebook=True) +o.add_option("-c", "--cmd", dest="cmd", + action="store_true", + help="treat remaining arguments as a command") +o.add_option("-l", "--list-cmd", dest="list_cmd", + action="store_true", + help="list available commands") +o.add_option("-i", "--info", dest="info", + action="store_true", + help="show runtime information") +o.add_option("--no-gui", dest="no_gui", + action="store_true", + help="run in non-gui mode") +o.add_option("-t", "--continue", dest="cont", + action="store_true", + help="continue to run after command execution") +o.add_option("", "--show-errors", dest="show_errors", + action="store_true", + help="show errors on console") +o.add_option("--no-show-errors", dest="show_errors", + action="store_false", + help="do not show errors on console") +o.add_option("--no-default", dest="default_notebook", + action="store_false", + help="do not open default notebook") +o.add_option("", "--newproc", dest="newproc", + action="store_true", + help="start KeepNote in a new process") +o.add_option("-p", "--port", dest="port", + default=None, + type="int", + help="use a specified port for listening to commands") + +# ============================================================================= + +def start_error_log(show_errors): + """Starts KeepNote error log""" + print("Starting error log...") + keepnote.init_error_log() + + stream_list = [] + stderr_test_str = "\n" + stderr_except_msg = "" + + if show_errors: + try: + sys.stderr.write(stderr_test_str) + except IOError: + formatted_msg = traceback.format_exc().splitlines() + stderr_except_msg = ''.join( + ['** stderr - unavailable for messages - ', + formatted_msg[-1], "\n"]) + else: + stream_list.append(sys.stderr) + + try: + errorlog = open(keepnote.get_user_error_log(), "a") + except IOError: + sys.exit(traceback.print_exc()) + else: + stream_list.append(errorlog) + + sys.stderr = TeeFileStream(stream_list, autoflush=True) + + keepnote.print_error_log_header() + keepnote.log_message(stderr_except_msg) + + +def parse_argv(argv): + """Parse arguments""" + options = o.get_default_values() + # Force show_errors=True to debug the issue + options.show_errors = True + + options, args = o.parse_args(argv[1:], options) + return options, args + + +def setup_threading(): + """Initialize threading environment""" + print("Setting up threading...") + try: + from gi.repository import GLib + except ImportError as e: + print(f"Failed to import gi.repository: {e}") + raise + + if keepnote.get_platform() == "windows": + def sleeper(): + time.sleep(0.001) + return True # Repeat timer + + GLib.timeout_add(400, sleeper) + + +def gui_exec(function, *args, **kwargs): + """Execute a function in the GUI thread""" + print("Executing in GUI thread...") + from gi.repository import GLib + + sem = threading.Semaphore() + sem.acquire() + + def idle_func(): + try: + function(*args, **kwargs) + return False + finally: + sem.release() + + GLib.idle_add(idle_func) + sem.acquire() + + +def start_gui(argv, options, args, cmd_exec): + print("🟢 start_gui called...") + try: + import keepnote.gui + from gi.repository import Gtk, Gio + print("✅ Imported keepnote.gui, Gtk, Gio") + except ImportError as e: + print(f"Failed to import GUI modules: {e}") + raise + + setup_threading() + print("🛠️ Creating KeepNote GUI app...") + app = keepnote.gui.KeepNote(basedir) + gtk_app = Gtk.Application(application_id="org.keepnote.py") + print("✅ Gtk.Application created") + cmd_exec.set_app(app) + print("🔧 cmd_exec linked to app") + def on_activate(gtk_app): + print("🚀 on_activate triggered") + need_gui = execute_command(app, argv) + print(f"📋 execute_command returned: {need_gui}") + if not need_gui: + print("💤 No GUI needed, quitting GTK app") + gtk_app.quit() + + gtk_app.connect("activate", on_activate) + print("🔗 Connected activate handler") + + print("🏁 Running Gtk Application loop") + gtk_app.run() + print("👋 Gtk Application loop exited") + +def start_non_gui(argv, options, args, cmd_exec): + print("Starting in non-GUI mode...") + app = keepnote.KeepNote(basedir) + app.init() + cmd_exec.set_app(app) + execute_command(app, argv) + + +def execute_command(app, argv): + """ + Execute commands given on command line + + Returns True if GUI event loop should be started + """ + print("DEBUG: Starting execute_command...") + options, args = parse_argv(argv) + print(f"DEBUG: Options: {options}, Args: {args}") + + if options.list_cmd: + print("DEBUG: Listing commands...") + list_commands(app) + return False + + if options.info: + print("DEBUG: Printing runtime info...") + keepnote.print_runtime_info(sys.stdout) + return False + + if options.cmd: + if len(args) == 0: + raise Exception(_("Expected command")) + print(f"DEBUG: Executing command: {args[0]}") + command = app.get_command(args[0]) + if command: + command.func(app, args) + else: + raise Exception(_("Unknown command '%s'") % args[0]) + + if not options.no_gui: + if len(app.get_windows()) == 0: + print("DEBUG: Creating new window for command...") + app.new_window() + return True + return False + + if options.no_gui: + print("DEBUG: Running in non-GUI mode...") + return False + + if len(args) > 0: + for arg in args: + if keepnote.notebook.is_node_url(arg): + print(f"DEBUG: Going to node ID: {arg}") + host, nodeid = keepnote.notebook.parse_node_url(arg) + app.goto_nodeid(nodeid) + elif keepnote.extension.is_extension_install_file(arg): + print(f"DEBUG: Installing extension: {arg}") + if len(app.get_windows()) == 0: + print("DEBUG: Creating new window for extension...") + app.new_window() + app.install_extension(arg) + else: + print(f"DEBUG: Opening notebook: {arg}") + if len(app.get_windows()) == 0: + print("DEBUG: Creating new window for notebook...") + app.new_window() + app.get_current_window().open_notebook(arg) + else: + print("DEBUG: Creating default window...") + if len(app.get_windows()) == 0: + print("DEBUG: No windows, creating one...") + app.new_window() # ✅ 添加这一行 + + # if len(app.get_windows()) == 1 and options.default_notebook: + # default_notebooks = app.pref.get("default_notebooks", default=[]) + # notebook_loaded = False + # for path in reversed(default_notebooks): + # if os.path.exists(path): + # print(f"DEBUG: Loading default notebook: {path}") + # if win.open_notebook(path, open_here=False): + # notebook_loaded = True + # break + # else: + # print(f"DEBUG: Skipping invalid default notebook path: {path}") + # + # if not notebook_loaded: + # print("DEBUG: No valid default notebooks found to load.") + + print("DEBUG: execute_command returning True") + return True + + +def list_commands(app): + """List available commands""" + commands = app.get_commands() + commands.sort(key=lambda x: x.name) + + print() + print("available commands:") + for command in commands: + print(" " + command.name, end="") + if command.metavar: + print(" " + command.metavar, end="") + if command.help: + print(" -- " + command.help, end="") + print() + + +# Setup sys.path to include KeepNote source if needed +BIN_DIR = os.path.dirname(os.path.realpath(__file__)) +SRC_DIR = os.path.abspath(os.path.join(BIN_DIR, "..", "keepnote.py")) +if SRC_DIR not in sys.path: + sys.path.insert(0, SRC_DIR) + +import keepnote + +def main(argv): + # 修改：添加异常捕获和调试日志，确保程序退出原因被记录 + # 原因：原始 main 未捕获异常，可能导致窗口一闪即逝后无声退出 + print("DEBUG: Entering main...") + try: + app = keepnote.KeepNoteApplication() + print("DEBUG: Running application...") + exit_status = app.run(argv) + print(f"DEBUG: Application exited with status: {exit_status}") + sys.exit(exit_status) + except Exception as e: + print(f"ERROR: Exception in main: {e}") + traceback.print_exc() + sys.exit(1) + + +if __name__ == '__main__': + main(sys.argv) + + def get_node(self, path): + if hasattr(self, 'notebook'): + return self.notebook.get_node_by_path(path) + else: + raise NotImplementedError("Notebook 尚未初始化，无法获取节点") \ No newline at end of file diff --git a/bin/test_pygobject.py b/bin/test_pygobject.py new file mode 100644 index 000000000..ebc126d90 --- /dev/null +++ b/bin/test_pygobject.py @@ -0,0 +1,39 @@ +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk + +# 定义窗口类，继承自 Gtk.Window +class MyWindow(Gtk.Window): + def __init__(self): + # 调用父类的构造函数，设置窗口标题 + super().__init__(title="Simple Window with Button") + + # 设置窗口默认大小 + self.set_default_size(400, 300) + + # 创建一个按钮 + self.button = Gtk.Button(label="Click Me!") + # 连接按钮的 "clicked" 信号到回调函数 + self.button.connect("clicked", self.on_button_clicked) + + # 将按钮添加到窗口 + self.add(self.button) + + # 连接窗口的 "destroy" 信号，点击关闭按钮时退出程序 + self.connect("destroy", Gtk.main_quit) + + # 按钮点击时的回调函数 + def on_button_clicked(self, widget): + print("Button was clicked!") + +# 主函数 +def main(): + # 创建窗口实例 + window = MyWindow() + # 显示窗口及其所有子控件 + window.show_all() + # 进入 GTK 主循环 + Gtk.main() + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/bower.json b/bower.json deleted file mode 100644 index 56979d9cd..000000000 --- a/bower.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "name": "keepnote", - "version": "0.7.9", - "authors": [ - "Matt Rasmussen " - ], - "description": "Note-taking and organization", - "license": "MIT", - "homepage": "http://keepnote.org", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "bootstrap": "~3.2.0", - "jquery": "~2.1.1", - "backbone": "~1.1.2", - "react": "~0.12.2", - "wysihtml": "~0.4.17", - "xmldom": "~0.1.16" - }, - "overrides": { - "bootstrap": { - "main": "dist/**/*.*", - "normalize": { - "css": [ - "*.map", - "*.css" - ], - "font": [ - "*.eot", - "*.svg", - "*.ttf", - "*.woff" - ] - } - }, - "jquery": { - "main": "dist/**/*.*" - }, - "react": { - "main": "*.js" - }, - "wysihtml": { - "main": [ - "dist/**/*.*", - "parser_rules/advanced_and_extended.js" - ] - }, - "xmldom": { - "main": ["dom.js"] - } - } -} diff --git a/gettext/es_ES.UTF8.po b/gettext/es_ES.UTF8.po index 10a0106c9..155761d72 100644 --- a/gettext/es_ES.UTF8.po +++ b/gettext/es_ES.UTF8.po @@ -1,11 +1,11 @@ -# Spanish translations for keepnote package +# Spanish translations for keepnote.py package # Copyright (C) 2009 Matt Rasmussen -# This file is distributed under the same license as the keepnote package. +# This file is distributed under the same license as the keepnote.py package. # # Klemens Häckel , 2009, 2010. msgid "" msgstr "" -"Project-Id-Version: keepnote 0.5.3\n" +"Project-Id-Version: keepnote.py 0.5.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2010-12-18 19:43+0100\n" diff --git a/gettext/fr_FR.UTF8.po b/gettext/fr_FR.UTF8.po index 466309893..2470390b4 100644 --- a/gettext/fr_FR.UTF8.po +++ b/gettext/fr_FR.UTF8.po @@ -1,12 +1,12 @@ -# French translations for keepnote package -# Traductions françaises du paquet keepnote. +# French translations for keepnote.py package +# Traductions françaises du paquet keepnote.py. # Copyright (C) 2009 Matt Rasmussen -# This file is distributed under the same license as the keepnote package. +# This file is distributed under the same license as the keepnote.py package. # tb , 2009. # msgid "" msgstr "" -"Project-Id-Version: keepnote 0.5.3\n" +"Project-Id-Version: keepnote.py 0.5.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2011-09-19 12:39+0100\n" diff --git a/gettext/it_IT.UTF8.po b/gettext/it_IT.UTF8.po index e44d7124f..c8b76f24e 100644 --- a/gettext/it_IT.UTF8.po +++ b/gettext/it_IT.UTF8.po @@ -1,12 +1,12 @@ -# Italian translations for keepnote package -# Traduzioni italiane per il pacchetto keepnote.. -# Copyright (C) 2010 THE keepnote'S COPYRIGHT HOLDER -# This file is distributed under the same license as the keepnote package. +# Italian translations for keepnote.py package +# Traduzioni italiane per il pacchetto keepnote.py.. +# Copyright (C) 2010 THE keepnote.py'S COPYRIGHT HOLDER +# This file is distributed under the same license as the keepnote.py package. # Davide Melan , 2010. # msgid "" msgstr "" -"Project-Id-Version: keepnote 0.6.2\n" +"Project-Id-Version: keepnote.py 0.6.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2010-06-19 17:43+0200\n" diff --git a/gettext/ja_JP.UTF8.po b/gettext/ja_JP.UTF8.po index e6cad05f6..97829a246 100644 --- a/gettext/ja_JP.UTF8.po +++ b/gettext/ja_JP.UTF8.po @@ -1,11 +1,11 @@ -# Japanese translations for keepnote package. -# Copyright (C) 2010 THE keepnote'S COPYRIGHT HOLDER -# This file is distributed under the same license as the keepnote package. +# Japanese translations for keepnote.py package. +# Copyright (C) 2010 THE keepnote.py'S COPYRIGHT HOLDER +# This file is distributed under the same license as the keepnote.py package. # Toshiharu Kudoh , 2010. # msgid "" msgstr "" -"Project-Id-Version: keepnote 0.7.9\n" +"Project-Id-Version: keepnote.py 0.7.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2012-07-23 01:12+0900\n" diff --git a/gettext/ru_RU.UTF8.po b/gettext/ru_RU.UTF8.po index f8877618f..243b0dce3 100644 --- a/gettext/ru_RU.UTF8.po +++ b/gettext/ru_RU.UTF8.po @@ -1,12 +1,12 @@ -# Russian translations for keepnote package -# Английские переводы для пакета keepnote. -# Copyright (C) 2010 THE keepnote'S COPYRIGHT HOLDER -# This file is distributed under the same license as the keepnote package. +# Russian translations for keepnote.py package +# Английские переводы для пакета keepnote.py. +# Copyright (C) 2010 THE keepnote.py'S COPYRIGHT HOLDER +# This file is distributed under the same license as the keepnote.py package. # hikiko mori , 2010. # msgid "" msgstr "" -"Project-Id-Version: keepnote 0.6.1\n" +"Project-Id-Version: keepnote.py 0.6.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2010-01-06 22:26+0200\n" diff --git a/gettext/sk_SK.UTF8.po b/gettext/sk_SK.UTF8.po index ec38093b6..c2d3f56fd 100644 --- a/gettext/sk_SK.UTF8.po +++ b/gettext/sk_SK.UTF8.po @@ -1,12 +1,12 @@ -# Slovak translations for keepnote package -# Slovenské preklady pre balík keepnote. -# Copyright (C) 2011 THE keepnote'S COPYRIGHT HOLDER -# This file is distributed under the same license as the keepnote package. +# Slovak translations for keepnote.py package +# Slovenské preklady pre balík keepnote.py. +# Copyright (C) 2011 THE keepnote.py'S COPYRIGHT HOLDER +# This file is distributed under the same license as the keepnote.py package. # Slavko , 2011. # msgid "" msgstr "" -"Project-Id-Version: keepnote 0.7.3\n" +"Project-Id-Version: keepnote.py 0.7.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2011-07-08 08:43+0200\n" diff --git a/gettext/sv_SE.UTF8.po b/gettext/sv_SE.UTF8.po index 58afe8258..029997605 100644 --- a/gettext/sv_SE.UTF8.po +++ b/gettext/sv_SE.UTF8.po @@ -1,12 +1,12 @@ -# Swedish translations for keepnote package -# Svenska översättningar för paket keepnote. -# Copyright (C) 2011 THE keepnote'S COPYRIGHT HOLDER -# This file is distributed under the same license as the keepnote package. +# Swedish translations for keepnote.py package +# Svenska översättningar för paket keepnote.py. +# Copyright (C) 2011 THE keepnote.py'S COPYRIGHT HOLDER +# This file is distributed under the same license as the keepnote.py package. # Morgan Antonsson , 2011. # msgid "" msgstr "" -"Project-Id-Version: keepnote 0.7.1\n" +"Project-Id-Version: keepnote.py 0.7.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2011-04-29 23:11+0200\n" diff --git a/gettext/tr_TR.UTF8.po b/gettext/tr_TR.UTF8.po index b6e72a2a8..bcef98643 100644 --- a/gettext/tr_TR.UTF8.po +++ b/gettext/tr_TR.UTF8.po @@ -1,11 +1,11 @@ -# Turkish translations for keepnote package. -# Copyright (C) 2009 THE keepnote'S COPYRIGHT HOLDER -# This file is distributed under the same license as the keepnote package. +# Turkish translations for keepnote.py package. +# Copyright (C) 2009 THE keepnote.py'S COPYRIGHT HOLDER +# This file is distributed under the same license as the keepnote.py package. # Yuce Tekol , 2009. # msgid "" msgstr "" -"Project-Id-Version: keepnote 0.5.3\n" +"Project-Id-Version: keepnote.py 0.5.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2009-07-09 07:47+0300\n" diff --git a/gettext/zh_CN.UTF8.po b/gettext/zh_CN.UTF8.po index 23a8fcfde..66b6be69e 100644 --- a/gettext/zh_CN.UTF8.po +++ b/gettext/zh_CN.UTF8.po @@ -1,12 +1,12 @@ -# Chinese translations for keepnote package -# keepnote 软件包的简体中文翻译. -# Copyright (C) 2010 THE keepnote'S COPYRIGHT HOLDER -# This file is distributed under the same license as the keepnote package. +# Chinese translations for keepnote.py package +# keepnote.py 软件包的简体中文翻译. +# Copyright (C) 2010 THE keepnote.py'S COPYRIGHT HOLDER +# This file is distributed under the same license as the keepnote.py package. # hudc , 2010. # msgid "" msgstr "" -"Project-Id-Version: keepnote 0.6.2\n" +"Project-Id-Version: keepnote.py 0.6.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-23 10:26-0400\n" "PO-Revision-Date: 2010-03-24 15:32+0800\n" diff --git a/gulpfile.js b/gulpfile.js index 80b7ed506..d6436531f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,28 +1,29 @@ -var child_process = require('child_process'); -var del = require('del'); -var gulp = require('gulp'); -var bowerNormalizer = require('gulp-bower-normalize'); -var mainBowerFiles = require('main-bower-files'); +const { src, dest, series, parallel } = require('gulp'); +const del = require('del'); -function buildBowerFiles() { - var stream = gulp.src(mainBowerFiles(), - {base: './bower_components'}) - .pipe(bowerNormalizer({bowerJson: './bower.json'})) - .pipe(gulp.dest('./keepnote/server/static/thirdparty/')); +// 定义要复制的文件 +const thirdPartyFiles = [ + 'node_modules/bootstrap/dist/**/*.*', + 'node_modules/jquery/dist/**/*.*', + 'node_modules/backbone/backbone*.js', + 'node_modules/react/*.js', + 'node_modules/wysihtml/dist/**/*.*', + 'node_modules/wysihtml/parser_rules/advanced_and_extended.js', + 'node_modules/xmldom/dom.js' +]; - stream.on('end', function () { - var patcher = child_process.spawn('patch', [ - '-N', - 'keepnote/server/static/thirdparty/xmldom/js/dom.js', - 'setup/xmldom.patch' - ]); - }); +// 清理任务 +function clean() { + return del(['keepnote.py/server/static/thirdparty/**']); } -gulp.task('bower-files', buildBowerFiles); - -gulp.task('clean', function (cb) { - del(['keepnote/server/static/thirdparty/**'], cb); -}); +// 构建任务 +function buildThirdParty() { + return src(thirdPartyFiles, { base: 'node_modules' }) + .pipe(dest('keepnote.py/server/static/thirdparty/')); +} -gulp.task('default', ['bower-files']); +// 默认任务 +exports.clean = clean; +exports.build = buildThirdParty; +exports.default = series(clean, buildThirdParty); \ No newline at end of file diff --git a/keepnote/__init__.py b/keepnote/__init__.py index c1baa893c..34a4508d2 100644 --- a/keepnote/__init__.py +++ b/keepnote/__init__.py @@ -1,31 +1,5 @@ -""" - KeepNote - Module for KeepNote - - Basic backend data structures for KeepNote and NoteBooks -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -# python imports +# Python imports +import json import os import shutil import sys @@ -36,26 +10,22 @@ import traceback import uuid import zipfile + +from gi.overrides.Pango import Pango + try: import xml.etree.cElementTree as ET except ImportError: - import xml.etree.elementtree.ElementTree as ET - + import xml.etree.ElementTree as ET -# work around pygtk changing default encoding -DEFAULT_ENCODING = sys.getdefaultencoding() -FS_ENCODING = sys.getfilesystemencoding() - -# keepnote imports +# KeepNote imports from keepnote import extension from keepnote import mswin from keepnote import orderdict from keepnote import plist from keepnote import safefile from keepnote.listening import Listeners -from keepnote.notebook import \ - NoteBookError, \ - get_unique_filename_list +from keepnote.notebook import NoteBookError, get_unique_filename_list import keepnote.notebook as notebooklib import keepnote.notebook.connection import keepnote.notebook.connection.fs @@ -65,211 +35,172 @@ import keepnote.trans from keepnote.trans import GETTEXT_DOMAIN import keepnote.xdg - - -#============================================================================= -# modules needed by builtin extensions -# these are imported here, so that py2exe can auto-discover them - +from gi.repository import Gtk import base64 -import htmlentitydefs +import html.entities from keepnote import tarfile import random import sgmllib import string -import xml.dom.minidom -import xml.sax.saxutils -# make pyflakes ignore these used modules +import xml.sax.saxutils +# from keepnote.py.gui.richtext.richtextbase_tags import RichTextTagTable +# Make pyflakes ignore these used modules GETTEXT_DOMAIN base64 get_unique_filename_list -htmlentitydefs +htmlentitydefs = html.entities random sgmllib string tarfile xml -# import screenshot so that py2exe discovers it +# make sure py2exe finds win32com try: - import mswin.screenshot + import sys + import modulefinder + import win32com + + for p in win32com.__path__[1:]: + modulefinder.AddPackagePath("win32com", p) + for extra in ["win32com.shell"]: + __import__(extra) + m = sys.modules[extra] + for p in m.__path__[1:]: + modulefinder.AddPackagePath(extra, p) except ImportError: + # no build path setup, no worries. pass +# 移除对 screenshot 的引用 +# try: +# from . import screenshot # type: ignore +# except ImportError: +# pass -#============================================================================= -# globals / constants - -PROGRAM_NAME = u"KeepNote" +# Globals / Constants +PROGRAM_NAME = "KeepNote" PROGRAM_VERSION_MAJOR = 0 PROGRAM_VERSION_MINOR = 7 PROGRAM_VERSION_RELEASE = 9 -PROGRAM_VERSION = (PROGRAM_VERSION_MAJOR, - PROGRAM_VERSION_MINOR, - PROGRAM_VERSION_RELEASE) - -if PROGRAM_VERSION_RELEASE != 0: - PROGRAM_VERSION_TEXT = "%d.%d.%d" % (PROGRAM_VERSION_MAJOR, - PROGRAM_VERSION_MINOR, - PROGRAM_VERSION_RELEASE) -else: - PROGRAM_VERSION_TEXT = "%d.%d" % (PROGRAM_VERSION_MAJOR, - PROGRAM_VERSION_MINOR) - -WEBSITE = u"http://keepnote.org" -LICENSE_NAME = u"GPL version 2" -COPYRIGHT = u"Copyright Matt Rasmussen 2011." -TRANSLATOR_CREDITS = ( - u"Chinese: hu dachuan \n" - u"French: tb \n" - u"French: Sebastien KALT \n" - u"German: Jan Rimmek \n" - u"Japanese: Toshiharu Kudoh \n" - u"Italian: Davide Melan \n" - u"Polish: Bernard Baraniewski \n" - u"Russian: Hikiko Mori \n" - u"Spanish: Klemens Hackel \n" - u"Slovak: Slavko \n" - u"Swedish: Morgan Antonsson \n" - u"Turkish: Yuce Tekol \n" +PROGRAM_VERSION = (PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_RELEASE) +PROGRAM_VERSION_TEXT = ( + f"{PROGRAM_VERSION_MAJOR}.{PROGRAM_VERSION_MINOR}.{PROGRAM_VERSION_RELEASE}" + if PROGRAM_VERSION_RELEASE != 0 + else f"{PROGRAM_VERSION_MAJOR}.{PROGRAM_VERSION_MINOR}" ) +WEBSITE = "http://keepnote.org" +LICENSE_NAME = "GPL version 2" +COPYRIGHT = "Copyright Matt Rasmussen 2011." +TRANSLATOR_CREDITS = ( + "Chinese: hu dachuan \n" + "French: tb \n" + "French: Sebastien KALT \n" + "German: Jan Rimmek \n" + "Japanese: Toshiharu Kudoh \n" + "Italian: Davide Melan \n" + "Polish: Bernard Baraniewski \n" + "Russian: Hikiko Mori \n" + "Spanish: Klemens Hackel \n" + "Slovak: Slavko \n" + "Swedish: Morgan Antonsson \n" + "Turkish: Yuce Tekol \n" +) -BASEDIR = os.path.dirname(unicode(__file__, FS_ENCODING)) +BASEDIR = os.path.dirname(os.path.abspath(__file__)) PLATFORM = None -USER_PREF_DIR = u"keepnote" -USER_PREF_FILE = u"keepnote.xml" -USER_LOCK_FILE = u"lockfile" -USER_ERROR_LOG = u"error-log.txt" -USER_EXTENSIONS_DIR = u"extensions" -USER_EXTENSIONS_DATA_DIR = u"extensions_data" -PORTABLE_FILE = u"portable.txt" - +USER_PREF_DIR = "keepnote" +USER_PREF_FILE = "keepnote.py.xml" +USER_LOCK_FILE = "lockfile" +USER_ERROR_LOG = "error-log.txt" +USER_EXTENSIONS_DIR = "extensions" +USER_EXTENSIONS_DATA_DIR = "extensions_data" +PORTABLE_FILE = "portable.txt" -#============================================================================= -# application resources +# Default encoding setup +DEFAULT_ENCODING = sys.getdefaultencoding() +FS_ENCODING = sys.getfilesystemencoding() -# TODO: cleanup, make get/set_basedir symmetrical +# Application resources def get_basedir(): - return os.path.dirname(unicode(__file__, FS_ENCODING)) + return os.path.dirname(os.path.abspath(__file__)) def set_basedir(basedir): global BASEDIR - if basedir is None: - BASEDIR = get_basedir() - else: - BASEDIR = basedir + BASEDIR = basedir if basedir else get_basedir() keepnote.trans.set_local_dir(get_locale_dir()) -def get_resource(*path_list): - return os.path.join(BASEDIR, *path_list) +# def get_resource(*path_list): +# return os.path.join(BASEDIR, *path_list) -#============================================================================= -# common functions - +# Common functions def get_platform(): - """Returns a string for the current platform""" global PLATFORM - if PLATFORM is None: p = sys.platform - if p == 'darwin': - PLATFORM = 'darwin' - elif p.startswith('win'): - PLATFORM = 'windows' - else: - PLATFORM = 'unix' - + PLATFORM = 'darwin' if p == 'darwin' else 'windows' if p.startswith('win') else 'unix' return PLATFORM def is_url(text): - """Returns True is text is a url""" - return re.match("^[^:]+://", text) is not None + return re.match(r"^[^:]+://", text) is not None -def ensure_unicode(text, encoding="utf8"): - """Ensures a string is unicode""" - - # let None's pass through +def ensure_unicode(text, encoding="utf-8"): if text is None: return None - - # make sure text is unicode - if not isinstance(text, unicode): - return unicode(text, encoding) - return text + return text if isinstance(text, str) else str(text, encoding) -def unicode_gtk(text): - """ - Converts a string from gtk (utf8) to unicode - All strings from the pygtk API are returned as byte strings (str) - encoded as utf8. KeepNote has the convention to keep all strings as - unicode internally. So strings from pygtk must be converted to unicode - immediately. - - Note: pygtk can accept either unicode or utf8 encoded byte strings. - """ - if text is None: - return None - return unicode(text, "utf8") def print_error_log_header(out=None): - """Display error log header""" - if out is None: - out = sys.stderr - - out.write("==============================================\n" - "%s %s: %s\n" % (keepnote.PROGRAM_NAME, - keepnote.PROGRAM_VERSION_TEXT, - time.asctime())) + out = out or sys.stderr + out.write( + "==============================================\n" + f"{PROGRAM_NAME} {PROGRAM_VERSION_TEXT}: {time.asctime()}\n" + ) def print_runtime_info(out=None): - """Display runtime information""" - - if out is None: - out = sys.stderr - - import keepnote - - out.write("Python runtime\n" - "--------------\n" - "sys.version=" + sys.version+"\n" - "sys.getdefaultencoding()="+DEFAULT_ENCODING+"\n" - "sys.getfilesystemencoding()="+FS_ENCODING+"\n" - "PYTHONPATH=" - " "+"\n ".join(sys.path)+"\n" - "\n" + out = out or sys.stderr + from keepnote.notebook.connection.fs.index import sqlite - "Imported libs\n" - "-------------\n" - "keepnote: " + keepnote.__file__+"\n") + out.write( + "Python runtime\n" + "--------------\n" + f"sys.version={sys.version}\n" + f"sys.getdefaultencoding()={DEFAULT_ENCODING}\n" + f"sys.getfilesystemencoding()={FS_ENCODING}\n" + "PYTHONPATH=\n " + "\n ".join(sys.path) + "\n\n" + "Imported libs\n" + "-------------\n" + f"keepnote.py: {keepnote.__file__}\n" + ) try: - import gtk - out.write("gtk: " + gtk.__file__+"\n") - out.write("gtk.gtk_version: "+repr(gtk.gtk_version)+"\n") - except: + from gi.repository import Gtk + out.write(f"gtk: {Gtk.__file__}\n") + out.write(f"gtk.gtk_version: {Gtk.get_major_version()}.{Gtk.get_minor_version()}.{Gtk.get_micro_version()}\n") + except ImportError: out.write("gtk: NOT PRESENT\n") - from keepnote.notebook.connection.fs.index import sqlite - out.write("sqlite: " + sqlite.__file__+"\n" - "sqlite.version: " + sqlite.version+"\n" - "sqlite.sqlite_version: " + sqlite.sqlite_version+"\n" - "sqlite.fts3: " + str(test_fts3())+"\n") - + out.write( + f"sqlite: {sqlite.__file__}\n" + f"sqlite.version: {sqlite.version}\n" + f"sqlite.sqlite_version: {sqlite.sqlite_version}\n" + f"sqlite.fts3: {test_fts3()}\n" + ) try: - import gtkspell - out.write("gtkspell: " + gtkspell.__file__+"\n") + import gtkspellcheck + out.write(f"gtkspell: {gtkspellcheck.__file__}\n") except ImportError: out.write("gtkspell: NOT PRESENT\n") out.write("\n") @@ -277,170 +208,140 @@ def print_runtime_info(out=None): def test_fts3(): from keepnote.notebook.connection.fs.index import sqlite - con = sqlite.connect(":memory:") try: con.execute("CREATE VIRTUAL TABLE fts3test USING fts3(col TEXT);") + return True except: return False finally: con.close() - return True -#============================================================================= -# locale functions - +# Locale functions def translate(message): - """Translate a string""" return keepnote.trans.translate(message) def get_locale_dir(): - """Returns KeepNote's locale directory""" - return get_resource(u"rc", u"locale") + return get_resource("rc", "locale") +def get_resource(*path_list): + return os.path.join(BASEDIR, *path_list) _ = translate -#============================================================================= -# preference filenaming scheme - - +# Preference filenaming scheme def get_home(): - """Returns user's HOME directory""" - home = ensure_unicode(os.getenv(u"HOME"), FS_ENCODING) + home = ensure_unicode(os.getenv("HOME"), FS_ENCODING) if home is None: raise EnvError("HOME environment variable must be specified") return home -def get_user_pref_dir(home=None): - """Returns the directory of the application preference file""" + + +def get_user_pref_dir(home=None): p = get_platform() - if p == "unix" or p == "darwin": + if p in ("unix", "darwin"): if home is None: home = get_home() return keepnote.xdg.get_config_file(USER_PREF_DIR, default=True) elif p == "windows": - # look for portable config if os.path.exists(os.path.join(BASEDIR, PORTABLE_FILE)): - return os.path.join(BASEDIR, USER_PREF_DIR) + path = os.path.join(BASEDIR, USER_PREF_DIR) + else: + appdata = get_win_env("APPDATA") + if appdata is None: + raise EnvError("APPDATA environment variable must be specified") + path = os.path.join(appdata, USER_PREF_DIR) - # otherwise, use application data dir - appdata = get_win_env("APPDATA") - if appdata is None: - raise EnvError("APPDATA environment variable must be specified") - return os.path.join(appdata, USER_PREF_DIR) + # ✅ 如果目录不存在，自动创建（避免 NoteBookError） + os.makedirs(path, exist_ok=True) + return path - else: - raise Exception("unknown platform '%s'" % p) + raise Exception(f"unknown platform '{p}'") def get_user_extensions_dir(pref_dir=None, home=None): - """Returns user extensions directory""" - if pref_dir is None: pref_dir = get_user_pref_dir(home) return os.path.join(pref_dir, USER_EXTENSIONS_DIR) def get_user_extensions_data_dir(pref_dir=None, home=None): - """Returns user extensions data directory""" - if pref_dir is None: pref_dir = get_user_pref_dir(home) return os.path.join(pref_dir, USER_EXTENSIONS_DATA_DIR) def get_system_extensions_dir(): - """Returns system-wide extensions directory""" - return os.path.join(BASEDIR, u"extensions") + return os.path.join(BASEDIR, "extensions") -def get_user_documents(home=None): - """Returns the directory of the user's documents""" - p = get_platform() - if p == "unix" or p == "darwin": - if home is None: - home = get_home() - return home - - elif p == "windows": - return unicode(mswin.get_my_documents(), FS_ENCODING) - +def get_user_documents(): + """Returns the path to the user's documents folder""" + if get_platform() == "windows": + return mswin.get_my_documents() else: - return u"" + return os.path.expanduser("~/Documents") def get_user_pref_file(pref_dir=None, home=None): - """Returns the filename of the application preference file""" if pref_dir is None: pref_dir = get_user_pref_dir(home) return os.path.join(pref_dir, USER_PREF_FILE) def get_user_lock_file(pref_dir=None, home=None): - """Returns the filename of the application lock file""" if pref_dir is None: pref_dir = get_user_pref_dir(home) return os.path.join(pref_dir, USER_LOCK_FILE) def get_user_error_log(pref_dir=None, home=None): - """Returns a file for the error log""" if pref_dir is None: pref_dir = get_user_pref_dir(home) return os.path.join(pref_dir, USER_ERROR_LOG) def get_win_env(key): - """Returns a windows environment variable""" - # try both encodings try: return ensure_unicode(os.getenv(key), DEFAULT_ENCODING) except UnicodeDecodeError: return ensure_unicode(os.getenv(key), FS_ENCODING) -#============================================================================= -# preference/extension initialization - +# Preference/extension initialization def init_user_pref_dir(pref_dir=None, home=None): - """Initializes the application preference file""" - if pref_dir is None: pref_dir = get_user_pref_dir(home) - - # make directory + print(f"Initializing pref_dir: {pref_dir}") if not os.path.exists(pref_dir): - os.makedirs(pref_dir, 0700) - - # init empty pref file + os.makedirs(pref_dir, mode=0o700) + print(f"Created directory: {pref_dir}") pref_file = get_user_pref_file(pref_dir) - if not os.path.exists(pref_file): - out = open(pref_file, "w") - out.write("\n") - out.write("\n") - out.write("\n") - out.close() - - # init error log + # Write default content if file doesn't exist OR is empty + if not os.path.exists(pref_file) or os.path.getsize(pref_file) == 0: + try: + with open(pref_file, "w", encoding="utf-8") as out: + out.write("\n\n\n") + print(f"Created or updated pref_file: {pref_file}, size: {os.path.getsize(pref_file)} bytes") + if os.path.getsize(pref_file) == 0: + raise IOError("Failed to write content to preferences file") + except Exception as e: + print(f"Failed to create/update pref_file: {e}") + raise init_error_log(pref_dir) - - # init user extensions extension.init_user_extensions(pref_dir) def init_error_log(pref_dir=None, home=None): - """Initialize the error log""" - if pref_dir is None: pref_dir = get_user_pref_dir(home) - error_log = get_user_error_log(pref_dir) if not os.path.exists(error_log): error_dir = os.path.dirname(error_log) @@ -450,27 +351,23 @@ def init_error_log(pref_dir=None, home=None): def log_error(error=None, tracebk=None, out=None): - """Write an exception error to the error log""" - - if out is None: - out = sys.stderr - + out = out or sys.stderr if error is None: ty, error, tracebk = sys.exc_info() - try: out.write("\n") - traceback.print_exception(type(error), error, tracebk, file=out) + if tracebk: + traceback.print_exception(type(error), error, tracebk, file=out) + else: + out.write(str(error)) # Handle string error out.flush() except UnicodeEncodeError: - out.write(error.encode("ascii", "replace")) + out.write(str(error).encode("ascii", "replace")) -def log_message(message, out=None): - """Write a message to the error log""" - if out is None: - out = sys.stderr +def log_message(message, out=None): + out = out or sys.stderr try: out.write(message) except UnicodeEncodeError: @@ -478,215 +375,151 @@ def log_message(message, out=None): out.flush() -#============================================================================= # Exceptions - - -class EnvError (StandardError): - """Exception that occurs when environment variables are ill-defined""" - +class EnvError(Exception): def __init__(self, msg, error=None): - StandardError.__init__(self) + super().__init__(msg) self.msg = msg self.error = error def __str__(self): - if self.error: - return str(self.error) + "\n" + self.msg - else: - return self.msg + return f"{self.error}\n{self.msg}" if self.error else self.msg -class KeepNoteError (StandardError): +class KeepNoteError(Exception): def __init__(self, msg, error=None): - StandardError.__init__(self, msg) + super().__init__(msg) self.msg = msg self.error = error def __repr__(self): - if self.error: - return str(self.error) + "\n" + self.msg - else: - return self.msg + return f"{self.error}\n{self.msg}" if self.error else self.msg def __str__(self): return self.msg -class KeepNotePreferenceError (StandardError): - """Exception that occurs when manipulating preferences""" - +class KeepNotePreferenceError(Exception): def __init__(self, msg, error=None): - StandardError.__init__(self) + super().__init__(msg) self.msg = msg self.error = error def __str__(self): - if self.error: - return str(self.error) + "\n" + self.msg - else: - return self.msg + return f"{self.error}\n{self.msg}" if self.error else self.msg -#============================================================================= # Preference data structures - -class ExternalApp (object): - """ - Class represents the information needed for calling an external application - """ - - def __init__(self, key, title, prog, args=[]): +class ExternalApp: + def __init__(self, key, title, prog, args=None): self.key = key self.title = title self.prog = prog - self.args = args + self.args = args or [] DEFAULT_EXTERNAL_APPS = [ - ExternalApp("file_launcher", "File Launcher", u""), - ExternalApp("web_browser", "Web Browser", u""), - ExternalApp("file_explorer", "File Explorer", u""), - ExternalApp("text_editor", "Text Editor", u""), - ExternalApp("image_editor", "Image Editor", u""), - ExternalApp("image_viewer", "Image Viewer", u""), - ExternalApp("screen_shot", "Screen Shot", u"") + ExternalApp("file_launcher", "File Launcher", ""), + ExternalApp("web_browser", "Web Browser", ""), + ExternalApp("file_explorer", "File Explorer", ""), + ExternalApp("text_editor", "Text Editor", ""), + ExternalApp("image_editor", "Image Editor", ""), + ExternalApp("image_viewer", "Image Viewer", ""), + ExternalApp("screen_shot", "Screen Shot", ""), ] def get_external_app_defaults(): if get_platform() == "windows": - files = ensure_unicode( - os.environ.get(u"PROGRAMFILES", u"C:\\Program Files"), FS_ENCODING) - + files = ensure_unicode(os.environ.get("PROGRAMFILES", "C:\\Program Files"), FS_ENCODING) return [ - ExternalApp("file_launcher", "File Launcher", u"explorer.exe"), - ExternalApp("web_browser", "Web Browser", - files + u"\\Internet Explorer\\iexplore.exe"), - ExternalApp("file_explorer", "File Explorer", u"explorer.exe"), - ExternalApp("text_editor", "Text Editor", - files + u"\\Windows NT\\Accessories\\wordpad.exe"), - ExternalApp("image_editor", "Image Editor", u"mspaint.exe"), - ExternalApp("image_viewer", "Image Viewer", - files + u"\\Internet Explorer\\iexplore.exe"), - ExternalApp("screen_shot", "Screen Shot", "") + ExternalApp("file_launcher", "File Launcher", "explorer.exe"), + ExternalApp("web_browser", "Web Browser", f"{files}\\Internet Explorer\\iexplore.exe"), + ExternalApp("file_explorer", "File Explorer", "explorer.exe"), + ExternalApp("text_editor", "Text Editor", f"{files}\\Windows NT\\Accessories\\wordpad.exe"), + ExternalApp("image_editor", "Image Editor", "mspaint.exe"), + ExternalApp("image_viewer", "Image Viewer", f"{files}\\Internet Explorer\\iexplore.exe"), + ExternalApp("screen_shot", "Screen Shot", ""), ] - elif get_platform() == "unix": return [ - ExternalApp("file_launcher", "File Launcher", u"xdg-open"), - ExternalApp("web_browser", "Web Browser", u""), - ExternalApp("file_explorer", "File Explorer", u""), - ExternalApp("text_editor", "Text Editor", u""), - ExternalApp("image_editor", "Image Editor", u""), - ExternalApp("image_viewer", "Image Viewer", u"display"), - ExternalApp("screen_shot", "Screen Shot", u"import") + ExternalApp("file_launcher", "File Launcher", "xdg-open"), + ExternalApp("web_browser", "Web Browser", ""), + ExternalApp("file_explorer", "File Explorer", ""), + ExternalApp("text_editor", "Text Editor", ""), + ExternalApp("image_editor", "Image Editor", ""), + ExternalApp("image_viewer", "Image Viewer", "display"), + ExternalApp("screen_shot", "Screen Shot", "import"), ] - else: - return DEFAULT_EXTERNAL_APPS + return DEFAULT_EXTERNAL_APPS -class KeepNotePreferences (Pref): - """Preference data structure for the KeepNote application""" - +class KeepNotePreferences(Pref): def __init__(self, pref_dir=None, home=None): - Pref.__init__(self) - if pref_dir is None: - self._pref_dir = get_user_pref_dir(home) - else: - self._pref_dir = pref_dir - - # listener + super().__init__() + self._pref_dir = pref_dir or get_user_pref_dir(home) + self._tree = ET.ElementTree(ET.Element("keepnote.py")) # Always start with valid tree self.changed = Listeners() - #self.changed.add(self._on_changed) def get_pref_dir(self): - """Returns preference directory""" return self._pref_dir - #def _on_changed(self): - # """Listener for preference changes""" - # self.write() - - #========================================= - # Input/Output - def read(self): - """Read preferences from file""" - - # ensure preference file exists - if not os.path.exists(get_user_pref_file(self._pref_dir)): - # write default + pref_file = get_user_pref_file(self._pref_dir) + print(f"Reading from: {pref_file}") + if not os.path.exists(pref_file) or os.path.getsize(pref_file) == 0: + print( + f"File missing or empty (exists: {os.path.exists(pref_file)}, size: {os.path.getsize(pref_file)} bytes)") try: init_user_pref_dir(self._pref_dir) - self.write() - except Exception, e: - raise KeepNotePreferenceError( - "Cannot initialize preferences", e) - + print( + f"After init_user_pref_dir, file exists: {os.path.exists(pref_file)}, size: {os.path.getsize(pref_file)} bytes") + with open(pref_file, "r", encoding="utf-8") as f: + content = f.read() + print(f"File content after init: {repr(content)}") + except Exception as e: + raise KeepNotePreferenceError("Cannot initialize preferences", e) + else: + print(f"File exists, size: {os.path.getsize(pref_file)} bytes") + with open(pref_file, "r", encoding="utf-8") as f: + content = f.read() + print(f"File content before parsing: {repr(content)}") try: - # read preferences xml - tree = ET.ElementTree( - file=get_user_pref_file(self._pref_dir)) - - # parse xml - # check tree structure matches current version + tree = ET.ElementTree(file=pref_file) root = tree.getroot() - if root.tag == "keepnote": - p = root.find("pref") - if p is None: - # convert from old preference version - import keepnote.compat.pref as old - old_pref = old.KeepNotePreferences() - old_pref.read(get_user_pref_file(self._pref_dir)) - data = old_pref._get_data() - else: - # get data object from xml - d = p.find("dict") - if d is not None: - data = plist.load_etree(d) - else: - data = orderdict.OrderDict() - - # set data - self._data.clear() - self._data.update(data) - except Exception, e: + print(f"Parsed root tag: {root.tag}") + if root.tag != "keepnote.py": + raise KeepNotePreferenceError("Invalid root tag in preferences file", None) + p = root.find("pref") + if p is None: + import keepnote.compat.pref as old + old_pref = old.KeepNotePreferences() + old_pref.read(pref_file) + data = old_pref._get_data() + else: + d = p.find("dict") + data = plist.load_etree(d) if d is not None else orderdict.OrderDict() + self._data.clear() + self._data.update(data) + except Exception as e: raise KeepNotePreferenceError("Cannot read preferences", e) - - # notify listeners self.changed.notify() def write(self): - """Write preferences to file""" - - try: - if not os.path.exists(self._pref_dir): - init_user_pref_dir(self._pref_dir) - - out = safefile.open(get_user_pref_file(self._pref_dir), "w", - codec="utf-8") - out.write(u'\n' - u'\n' - u'\n') - plist.dump(self._data, out, indent=4, depth=4) - out.write(u'\n' - u'\n') - - out.close() - - except (IOError, OSError), e: - log_error(e, sys.exc_info()[2]) - raise NoteBookError(_("Cannot save preferences"), e) + pref_file = get_user_pref_file(self._pref_dir) + if self._tree is None or self._tree.getroot() is None: + self._tree = ET.ElementTree(ET.Element("keepnote.py")) + # Add current preferences to the tree before writing + root = self._tree.getroot() + pref_elem = ET.SubElement(root, "pref") + dict_elem = ET.SubElement(pref_elem, "dict") + plist.dump_etree(self._data, dict_elem) + with open(pref_file, "w", encoding="utf-8") as out: + self._tree.write(out, encoding="unicode", xml_declaration=True) -#============================================================================= # Application class - - -class ExtensionEntry (object): - """An entry for an Extension in the KeepNote application""" - +class ExtensionEntry: def __init__(self, filename, ext_type, ext): self.filename = filename self.ext_type = ext_type @@ -696,238 +529,166 @@ def get_key(self): return os.path.basename(self.filename) -class AppCommand (object): - """Application Command""" - - def __init__(self, name, func=lambda app, args: None, - metavar="", help=""): +class AppCommand: + def __init__(self, name, func=lambda app, args: None, metavar="", help=""): self.name = name self.func = func self.metavar = metavar self.help = help -class KeepNote (object): - """KeepNote application class""" - +class KeepNote: def __init__(self, basedir=None, pref_dir=None): - - # base directory of keepnote library if basedir is not None: set_basedir(basedir) self._basedir = BASEDIR - - # load application preferences self.pref = KeepNotePreferences(pref_dir) self.pref.changed.add(self._on_pref_changed) - self.id = None - - # list of registered application commands self._commands = {} - - # list of opened notebooks self._notebooks = {} - self._notebook_count = {} # notebook ref counts - - # default protocols for notebooks + self._notebook_count = {} self._conns = keepnote.notebook.connection.NoteBookConnections() - self._conns.add( - "file", keepnote.notebook.connection.fs.NoteBookConnectionFS) - self._conns.add( - "http", keepnote.notebook.connection.http.NoteBookConnectionHttp) - - # external apps + self._conns.add("file", keepnote.notebook.connection.fs.NoteBookConnectionFS) + self._conns.add("http", keepnote.notebook.connection.http.NoteBookConnectionHttp) self._external_apps = [] self._external_apps_lookup = {} - - # set of registered extensions for this application self._extension_paths = [] self._extensions = {} self._disabled_extensions = [] - - # listeners self._listeners = {} + # Initialization code for KeepNote + self.pref_dir = pref_dir + self._richtext_tag_table = self.create_richtext_tag_table() # Initialize the tag table - def init(self): - """Initialize from preferences saved on disk""" + def get_richtext_tag_table(self): + # Ensure that this method returns the richtext tag table. + if not hasattr(self, "_richtext_tag_table"): + self._richtext_tag_table = self.create_richtext_tag_table() # Create if it doesn't exist + return self._richtext_tag_table - # read preferences - self.pref.read() - self.load_preferences() + def create_richtext_tag_table(self): + # Create a new GtkTextTagTable and populate it with tags + tag_table = Gtk.TextTagTable() - # init extension paths - self._extension_paths = [ - (get_system_extensions_dir(), "system"), - (get_user_extensions_dir(self.get_pref_dir()), "user")] + # Example: Add tags to the table (this depends on the actual dictionary structure) + tag = Gtk.TextTag.new("example-tag") + tag_table.add(tag) - # initialize all extensions - self.init_extensions() + # You should create and add tags based on the dictionary + # For example, assuming the dictionary is {'tag_name': tag_properties} + tag_properties = {'tag_name': 'bold', 'weight': Pango.Weight.BOLD} + tag = Gtk.TextTag.new(tag_properties['tag_name']) + tag.set_property("weight", tag_properties['weight']) + tag_table.add(tag) - def load_preferences(self): - """Load information from preferences""" + return tag_table + + def init(self): + import threading + if threading.current_thread() is not threading.main_thread(): + print("Error: GTK must run in the main thread") + sys.exit(1) + # super().init() + def load_preferences(self): self.language = self.pref.get("language", default="") self.set_lang() - - # setup id self.id = self.pref.get("id", default="") - if self.id == "": + if not self.id: self.id = str(uuid.uuid4()) self.pref.set("id", self.id) - - # TODO: move to gui app? - # set default timestamp formats - self.pref.get( - "timestamp_formats", - default=dict(keepnote.timestamp.DEFAULT_TIMESTAMP_FORMATS)) - - # external apps + self.pref.get("timestamp_formats", default=dict(keepnote.timestamp.DEFAULT_TIMESTAMP_FORMATS)) self._load_external_app_preferences() - - # extensions - self._disabled_extensions = self.pref.get( - "extension_info", "disabled", default=[]) + self._disabled_extensions = self.pref.get("extension_info", "disabled", default=[]) self.pref.get("extensions", define=True) def save_preferences(self): - """Save information into preferences""" - - # language self.pref.set("language", self.language) - - # external apps self.pref.set("external_apps", [ - {"key": app.key, - "title": app.title, - "prog": app.prog, - "args": app.args} - for app in self._external_apps]) - - # extensions - self.pref.set("extension_info", { - "disabled": self._disabled_extensions[:] - }) - - # save to disk + {"key": app.key, "title": app.title, "prog": app.prog, "args": app.args} + for app in self._external_apps + ]) + self.pref.set("extension_info", {"disabled": self._disabled_extensions[:]}) self.pref.write() def _on_pref_changed(self): - """Callback for when application preferences change""" self.load_preferences() def set_lang(self): - """Set the language based on preference""" keepnote.trans.set_lang(self.language) def error(self, text, error=None, tracebk=None): - """Display an error message""" keepnote.log_message(text) if error is not None: keepnote.log_error(error, tracebk) def quit(self): - """Stop the application""" - if self.pref.get("use_last_notebook", default=False): - self.pref.set("default_notebooks", - [n.get_path() for n in self.iter_notebooks()]) - + self.pref.set("default_notebooks", [n.get_path() for n in self.iter_notebooks()]) self.save_preferences() def get_default_path(self, name): - """Returns a default path for saving/reading files""" - return self.pref.get("default_paths", name, - default=get_user_documents()) + return self.pref.get("default_paths", name, default=get_user_documents()) def set_default_path(self, name, path): - """Sets the default path for saving/reading files""" self.pref.set("default_paths", name, path) def get_pref_dir(self): return self.pref.get_pref_dir() - #================================== # Notebooks - def open_notebook(self, filename, window=None, task=None): - """Open a new notebook""" - try: conn = self._conns.get(filename) notebook = notebooklib.NoteBook() notebook.load(filename, conn) + return notebook except Exception: return None - return notebook def close_notebook(self, notebook): - """Close notebook""" - if self.has_ref_notebook(notebook): self.unref_notebook(notebook) def close_all_notebook(self, notebook, save=True): - """Close all instances of a notebook""" - try: notebook.close(save) except: keepnote.log_error() - notebook.closing_event.remove(self._on_closing_notebook) del self._notebook_count[notebook] - - for key, val in self._notebooks.iteritems(): + for key, val in list(self._notebooks.items()): if val == notebook: del self._notebooks[key] break def _on_closing_notebook(self, notebook, save): - """ - Callback for when notebook is about to close - """ pass def get_notebook(self, filename, window=None, task=None): - """ - Returns a an opened notebook referenced by filename - - Open a new notebook if it is not already opened. - """ - try: - filename = notebooklib.normalize_notebook_dirname( - filename, longpath=False) + filename = notebooklib.normalize_notebook_dirname(filename, longpath=False) filename = os.path.realpath(filename) except: pass - if filename not in self._notebooks: notebook = self.open_notebook(filename, window, task=task) if notebook is None: return None - - # perform bookkeeping self._notebooks[filename] = notebook notebook.closing_event.add(self._on_closing_notebook) self.ref_notebook(notebook) else: notebook = self._notebooks[filename] self.ref_notebook(notebook) - return notebook def ref_notebook(self, notebook): - if notebook not in self._notebook_count: - self._notebook_count[notebook] = 1 - else: - self._notebook_count[notebook] += 1 + self._notebook_count[notebook] = self._notebook_count.get(notebook, 0) + 1 def unref_notebook(self, notebook): self._notebook_count[notebook] -= 1 - - # close if refcount is zero if self._notebook_count[notebook] == 0: self.close_all_notebook(notebook) @@ -935,522 +696,502 @@ def has_ref_notebook(self, notebook): return notebook in self._notebook_count def iter_notebooks(self): - """Iterate through open notebooks""" - return self._notebooks.itervalues() + return iter(self._notebooks.values()) def save_notebooks(self, silent=False): - """Save all opened notebooks""" - - # save all the notebooks - for notebook in self._notebooks.itervalues(): + for notebook in self._notebooks.values(): notebook.save() - def get_node(self, nodeid): - """Returns a node with 'nodeid' from any of the opened notebooks""" - for notebook in self._notebooks.itervalues(): + + def get_node(self, nodeid): + for notebook in self._notebooks.values(): node = notebook.get_node_by_id(nodeid) if node is not None: return node - return None def save(self, silent=False): - """Save notebooks and preferences""" - self.save_notebooks() - self.save_preferences() - #================================ - # listeners - + # Listeners def get_listeners(self, key): - listeners = self._listeners.get(key, None) - if listeners is None: - listeners = Listeners() - self._listeners[key] = listeners - return listeners - - #================================ - # external apps + if key not in self._listeners: + self._listeners[key] = Listeners() + return self._listeners[key] + # External apps def _load_external_app_preferences(self): - - # external apps self._external_apps = [] for app in self.pref.get("external_apps", default=[]): if "key" not in app: continue - app2 = ExternalApp(app["key"], - app.get("title", ""), - app.get("prog", ""), - app.get("args", "")) + app2 = ExternalApp(app["key"], app.get("title", ""), app.get("prog", ""), app.get("args", "")) self._external_apps.append(app2) - - # make lookup - self._external_apps_lookup = {} - for app in self._external_apps: - self._external_apps_lookup[app.key] = app - - # add default programs - lst = get_external_app_defaults() - for defapp in lst: + self._external_apps_lookup = {app.key: app for app in self._external_apps} + for defapp in get_external_app_defaults(): if defapp.key not in self._external_apps_lookup: self._external_apps.append(defapp) self._external_apps_lookup[defapp.key] = defapp - - # place default apps first - lookup = dict((x.key, i) for i, x in enumerate(DEFAULT_EXTERNAL_APPS)) + lookup = {x.key: i for i, x in enumerate(DEFAULT_EXTERNAL_APPS)} top = len(DEFAULT_EXTERNAL_APPS) self._external_apps.sort(key=lambda x: (lookup.get(x.key, top), x.key)) def get_external_app(self, key): - """Return an external application by its key name""" - app = self._external_apps_lookup.get(key, None) - if app == "": - app = None - return app + app = self._external_apps_lookup.get(key) + return None if app == "" else app def iter_external_apps(self): return iter(self._external_apps) def run_external_app(self, app_key, filename, wait=False): - """Runs a registered external application on a file""" - app = self.get_external_app(app_key) - - if app is None or app.prog == "": - if app: - raise KeepNoteError( - _("Must specify '%s' program in Helper Applications" % - app.title)) - else: - raise KeepNoteError( - _("Must specify '%s' program in Helper Applications" % - app_key)) - - # build command arguments + if not app or not app.prog: + title = app.title if app else app_key + raise KeepNoteError(f"Must specify '{title}' program in Helper Applications") cmd = [app.prog] + app.args if "%f" not in cmd: cmd.append(filename) else: - for i in xrange(len(cmd)): - if cmd[i] == "%f": - cmd[i] = filename - - # create proper encoding - cmd = map(lambda x: unicode(x), cmd) + cmd = [filename if x == "%f" else x for x in cmd] + cmd = [str(x) for x in cmd] if get_platform() == "windows": cmd = [x.encode('mbcs') for x in cmd] else: cmd = [x.encode(FS_ENCODING) for x in cmd] - - # execute command try: proc = subprocess.Popen(cmd) - except OSError, e: + return proc.wait() if wait else None + except OSError as e: raise KeepNoteError( - _(u"Error occurred while opening file with %s.\n\n" - u"program: '%s'\n\n" - u"file: '%s'\n\n" - u"error: %s") - % (app.title, app.prog, filename, unicode(e)), e) - - # wait for process to return - # TODO: perform waiting in gtk loop - # NOTE: I do not wait for any program yet - if wait: - return proc.wait() + f"Error occurred while opening file with {app.title}.\n\n" + f"program: '{app.prog}'\n\nfile: '{filename}'\n\nerror: {e}", e + ) def run_external_app_node(self, app_key, node, kind, wait=False): - """Runs an external application on a node""" - if kind == "dir": filename = node.get_path() else: - if node.get_attr("content_type") == notebooklib.CONTENT_TYPE_PAGE: - # get html file + content_type = node.get_attr("content_type") + if content_type == notebooklib.CONTENT_TYPE_PAGE: filename = node.get_data_file() - - elif node.get_attr("content_type") == notebooklib.CONTENT_TYPE_DIR: - # get node dir + elif content_type == notebooklib.CONTENT_TYPE_DIR: filename = node.get_path() - elif node.has_attr("payload_filename"): - # get payload file filename = node.get_file(node.get_attr("payload_filename")) else: - raise KeepNoteError(_("Unable to determine note type.")) - - #if not filename.startswith("http://"): - # filename = os.path.realpath(filename) - + raise KeepNoteError("Unable to determine note type.") self.run_external_app(app_key, filename, wait=wait) def open_webpage(self, url): - """View a node with an external web browser""" - if url: self.run_external_app("web_browser", url) def take_screenshot(self, filename): - """Take a screenshot and save it to 'filename'""" - - # make sure filename is unicode filename = ensure_unicode(filename, "utf-8") - if get_platform() == "windows": - # use win32api to take screenshot - # create temp file - - f, imgfile = tempfile.mkstemp(u".bmp", filename) - os.close(f) - mswin.screenshot.take_screenshot(imgfile) + # 禁用 Windows 上的截图功能 + raise NotImplementedError("Screenshot functionality is not supported on Windows without pywin32.") else: - # use external app for screen shot screenshot = self.get_external_app("screen_shot") - if screenshot is None or screenshot.prog == "": - raise Exception( - _("You must specify a Screen Shot program in " - "Application Options")) - - # create temp file - f, imgfile = tempfile.mkstemp(".png", filename) + if not screenshot or not screenshot.prog: + raise Exception("You must specify a Screen Shot program in Application Options") + f, imgfile = tempfile.mkstemp(".png", prefix=os.path.basename(filename)) os.close(f) - proc = subprocess.Popen([screenshot.prog, imgfile]) if proc.wait() != 0: raise OSError("Exited with error") - if not os.path.exists(imgfile): - # catch error if image is not created - raise Exception( - _("The screenshot program did not create the necessary " - "image file '%s'") % imgfile) - + raise Exception(f"The screenshot program did not create the necessary image file '{imgfile}'") return imgfile - #================================ - # commands - + # Commands def get_command(self, command_name): - """Returns a command of the given name 'command_name'""" - return self._commands.get(command_name, None) + return self._commands.get(command_name) def get_commands(self): - """Returns a list of all registered commands""" - return self._commands.values() + return list(self._commands.values()) def add_command(self, command): - """Adds a command to the application""" if command.name in self._commands: - raise Exception(_("command '%s' already exists") % command.name) - + raise Exception(f"command '{command.name}' already exists") self._commands[command.name] = command def remove_command(self, command_name): - """Removes a command from the application""" - if command_name in self._commands: - del self._commands[command_name] - - #================================ - # extensions + self._commands.pop(command_name, None) + # Extensions def init_extensions(self): - """Enable all extensions""" - - # remove all existing extensions self._clear_extensions() - - # scan for extensions self._scan_extension_paths() - - # import all extensions self._import_all_extensions() - - # enable those extensions that have their dependencies met for ext in self.get_imported_extensions(): - # enable extension try: if ext.key not in self._disabled_extensions: - log_message(_("enabling extension '%s'\n") % ext.key) + log_message(f"enabling extension '{ext.key}'\n") ext.enable(True) - - except extension.DependencyError, e: - # could not enable due to failed dependency - log_message(_(" skipping extension '%s':\n") % ext.key) + except extension.DependencyError as e: + log_message(f" skipping extension '{ext.key}':\n") for dep in ext.get_depends(): if not self.dependency_satisfied(dep): - log_message(_(" failed dependency: %s\n") % - repr(dep)) - - except Exception, e: - # unknown error + log_message(f" failed dependency: {dep}\n") + except Exception as e: log_error(e, sys.exc_info()[2]) def _clear_extensions(self): - """Disable and unregister all extensions for the app""" - - # disable all enabled extensions for ext in list(self.get_enabled_extensions()): ext.disable() - - # reset registered extensions list - self._extensions = { - "keepnote": ExtensionEntry("", "system", KeepNoteExtension(self))} + self._extensions = {"keepnote.py": ExtensionEntry("", "system", KeepNoteExtension(self))} def _scan_extension_paths(self): - """Scan all extension paths""" for path, ext_type in self._extension_paths: self._scan_extension_path(path, ext_type) def _scan_extension_path(self, extensions_path, ext_type): - """ - Scan extensions directory and register extensions with app - - extensions_path -- path for extensions - ext_type -- "user"/"system" - """ for filename in extension.scan_extensions_dir(extensions_path): self.add_extension(filename, ext_type) def add_extension(self, filename, ext_type): - """Add an extension filename to the app's extension entries""" entry = ExtensionEntry(filename, ext_type, None) self._extensions[entry.get_key()] = entry return entry def remove_extension(self, ext_key): - """Remove an extension entry""" - - # retrieve information about extension - entry = self._extensions.get(ext_key, None) + entry = self._extensions.get(ext_key) if entry: if entry.ext: - # disable extension entry.ext.enable(False) - - # unregister extension from app del self._extensions[ext_key] def get_extension(self, name): - """Get an extension module by name""" - - # return None if extension name is unknown if name not in self._extensions: return None - - # get extension information entry = self._extensions[name] - - # load if first use if entry.ext is None: self._import_extension(entry) - return entry.ext def get_installed_extensions(self): - """Iterates through installed extensions""" - return self._extensions.iterkeys() + return iter(self._extensions.keys()) def get_imported_extensions(self): - """Iterates through imported extensions""" - for entry in self._extensions.values(): - if entry.ext is not None: - yield entry.ext + return (entry.ext for entry in self._extensions.values() if entry.ext is not None) def get_enabled_extensions(self): - """Iterates through enabled extensions""" - for ext in self.get_imported_extensions(): - if ext.is_enabled(): - yield ext + return (ext for ext in self.get_imported_extensions() if ext.is_enabled()) def _import_extension(self, entry): - """Import an extension from an extension entry""" try: - entry.ext = extension.import_extension( - self, entry.get_key(), entry.filename) - except KeepNotePreferenceError, e: + entry.ext = extension.import_extension(self, entry.get_key(), entry.filename) + # Check if the extension was successfully loaded + if entry.ext is None: + log_message(f"Extension '{entry.get_key()}' was not loaded (skipped or failed)\n") + return None # Skip further processing for this extension + entry.ext.type = entry.ext_type + entry.ext.enabled.add(lambda e: self.on_extension_enabled(entry.ext, e)) + return entry.ext + except KeepNotePreferenceError as e: log_error(e, sys.exc_info()[2]) return None - entry.ext.type = entry.ext_type - entry.ext.enabled.add( - lambda e: self.on_extension_enabled(entry.ext, e)) - return entry.ext - def _import_all_extensions(self): - """Import all extensions""" - for entry in self._extensions.values(): - # load if first use + for entry in list(self._extensions.values()): if entry.ext is None: + log_message(f"Importing extension: {entry.get_key()} (filename: {entry.filename})\n") self._import_extension(entry) def dependency_satisfied(self, dep): - """ - Returns True if dependency 'dep' is satisfied by registered extensions - """ ext = self.get_extension(dep[0]) return extension.dependency_satisfied(ext, dep) def dependencies_satisfied(self, depends): - """Returns True if dependencies 'depends' are satisfied""" - - for dep in depends: - ext = self.get_extension(dep[0]) - if ext is None or not extension.dependency_satisfied(ext, dep): - return False - return True + return all(self.dependency_satisfied(dep) for dep in depends) def on_extension_enabled(self, ext, enabled): - """Callback for when extension is enabled""" - - # update user preference on which extensions are disabled - if enabled: - if ext.key in self._disabled_extensions: - self._disabled_extensions.remove(ext.key) - else: - if ext.key not in self._disabled_extensions: - self._disabled_extensions.append(ext.key) + if enabled and ext.key in self._disabled_extensions: + self._disabled_extensions.remove(ext.key) + elif not enabled and ext.key not in self._disabled_extensions: + self._disabled_extensions.append(ext.key) def install_extension(self, filename): - """Install a new extension from package 'filename'""" - - log_message(_("Installing extension '%s'\n") % filename) - + log_message(f"Installing extension '{filename}'\n") userdir = get_user_extensions_dir(self.get_pref_dir()) - newfiles = [] try: - # unzip and record new files for fn in unzip(filename, userdir): newfiles.append(fn) - - # rescan user extensions exts = set(self._extensions.keys()) self._scan_extension_path(userdir, "user") - - # find new extensions new_names = set(self._extensions.keys()) - exts new_exts = [self.get_extension(name) for name in new_names] - - except Exception, e: - self.error(_("Unable to install extension '%s'") % filename, - e, tracebk=sys.exc_info()[2]) - - # delete newfiles + except Exception as e: + self.error(f"Unable to install extension '{filename}'", e, sys.exc_info()[2]) for newfile in newfiles: try: - keepnote.log_message(_("Removing file '%s'") % newfile) + log_message(f"Removing file '{newfile}'\n") os.remove(newfile) except: - # delete may fail, continue pass - return [] - - # enable new extensions - log_message(_("Enabling new extensions:\n")) + log_message("Enabling new extensions:\n") for ext in new_exts: - log_message(_("enabling extension '%s'\n") % ext.key) + log_message(f"enabling extension '{ext.key}'\n") ext.enable(True) - return new_exts def uninstall_extension(self, ext_key): - """Uninstall an extension""" - - # retrieve information about extension - entry = self._extensions.get(ext_key, None) - - if entry is None: - self.error( - _("Unable to uninstall unknown extension '%s'.") % ext_key) + entry = self._extensions.get(ext_key) + if not entry: + self.error(f"Unable to uninstall unknown extension '{ext_key}'.") return False - - # cannot uninstall system extensions if entry.ext_type != "user": - self.error(_("KeepNote can only uninstall user extensions")) + self.error("KeepNote can only uninstall user extensions") return False - - # remove extension from runtime self.remove_extension(ext_key) - - # delete extension from filesystem try: shutil.rmtree(entry.filename) except OSError: - self.error( - _("Unable to uninstall extension. Do not have permission.")) + self.error("Unable to uninstall extension. Do not have permission.") return False - return True def can_uninstall(self, ext): - """Return True if extension can be uninstalled""" return ext.type != "system" def get_extension_base_dir(self, extkey): - """Get base directory of an extension""" return self._extensions[extkey].filename def get_extension_data_dir(self, extkey): - """Get the data directory of an extension""" - return os.path.join( - get_user_extensions_data_dir(self.get_pref_dir()), extkey) + return os.path.join(get_user_extensions_data_dir(self.get_pref_dir()), extkey) def unzip(filename, outdir): - """Unzip an extension""" + with zipfile.ZipFile(filename) as extzip: + for fn in extzip.namelist(): + if fn.endswith(("/", "\\")): + continue + if fn.startswith("../") or "/../" in fn: + raise Exception(f"bad file paths in zipfile '{fn}'") + newfilename = os.path.join(outdir, fn) + dirname = os.path.dirname(newfilename) + if not os.path.exists(dirname): + os.makedirs(dirname) + elif not os.path.isdir(dirname) or os.path.exists(newfilename): + raise Exception("Cannot unzip. Other files are in the way") + with open(newfilename, "wb") as out: + out.write(extzip.read(fn)) + yield newfilename + + +class KeepNoteExtension(extension.Extension): + version = PROGRAM_VERSION + key = "keepnote.py" + name = "KeepNote" + description = "The KeepNote application" + visible = False - extzip = zipfile.ZipFile(filename) + def __init__(self, app): + super().__init__(app) - for fn in extzip.namelist(): - if fn.endswith("/") or fn.endswith("\\"): - # skip directory entries - continue + def enable(self, enable): + super().enable(True) + return True - # quick test for unusual filenames - if fn.startswith("../") or "/../" in fn: - raise Exception("bad file paths in zipfile '%s'" % fn) + def get_richtext_tag_table(self): + """ + 返回富文本编辑器用的标签表（Gtk.TextTagTable） + 这通常是用于高亮、粗体、颜色等文本标记。 + """ + if not hasattr(self, "_richtext_tag_table"): + self._richtext_tag_table = Gtk.TextTagTable() + return self._richtext_tag_table + + +def get_depends(self): + return [] + +class Listener: + def __init__(self): + self._callbacks = [] + + def add(self, callback): + if callback not in self._callbacks: + self._callbacks.append(callback) + + def remove(self, callback): + if callback in self._callbacks: + self._callbacks.remove(callback) + + def fire(self, *args, **kwargs): + for callback in self._callbacks: + callback(*args, **kwargs) + +class KeepNoteApplication(Gtk.Application): + # def get_richtext_tag_table(self): + # # TODO: Return a tag table for rich text editing + # from gi.repository import Gtk + # return Gtk.TextTagTable() + def __init__(self): + Gtk.Application.__init__(self, application_id="org.keepnote.py.KeepNote") + self._tag_table = None + self.pref = self.load_preferences() + self.connect("activate", self.do_activate) + self._notebooks = [] + self._windows = [] + self._window = None + self._activated = False # 初始化 _activated 属性 + self._app = None # 初始化 _app 属性 + # Ensure _app is initialized properly here + self._app = KeepNote(pref_dir=self.get_pref_dir()) + print("✅ Application finished without exception.") - # determine extracted filename - newfilename = os.path.join(outdir, fn) + def get_pref_dir(self): + # Make sure this method returns the preferences directory + return get_user_pref_dir(home=None) # Calls the previously defined get_user_pref_dir function - # ensure directory exists - dirname = os.path.dirname(newfilename) - if not os.path.exists(dirname): - os.makedirs(dirname) - elif not os.path.isdir(dirname) or os.path.exists(newfilename): - raise Exception("Cannot unzip. Other files are in the way") + def set_app(self, app): + self._app = app - # extract file - out = open(newfilename, "wb") - out.write(extzip.read(fn)) - out.flush() - out.close() + def load_preferences(self): + """ + 加载用户偏好设置，可以是 JSON 或其他格式 + """ + config_path = os.path.join(keepnote.get_user_pref_dir(), "settings.json") + if os.path.exists(config_path): + try: + with open(config_path, "r", encoding="utf-8") as f: + return json.load(f) + except Exception as e: + print("Error loading preferences:", e) + return {} - yield newfilename + def get_listeners(self, key): + if not hasattr(self, "_listeners"): + self._listeners = {} + if key not in self._listeners: + self._listeners[key] = Listener() + return self._listeners[key] + def ref_notebook(self, notebook): + """注册一个 notebook 引用，避免重复添加""" + if notebook not in self._notebooks: + self._notebooks.append(notebook) -class KeepNoteExtension (extension.Extension): - """Extension that represents the application itself""" + def unref_notebook(self, notebook): + """注销 notebook 引用""" + if notebook in self._notebooks: + self._notebooks.remove(notebook) - version = PROGRAM_VERSION - key = "keepnote" - name = "KeepNote" - description = "The KeepNote application" - visible = False + def get_notebooks(self): + """获取当前引用的所有 notebooks""" + return list(self._notebooks) - def __init__(self, app): - extension.Extension.__init__(self, app) - def enable(self, enable): - """This extension is always enabled""" - extension.Extension.enable(self, True) - return True + def get_richtext_tag_table(self): + if self._tag_table is None: + from keepnote.gui.richtext.richtextbase_tags import RichTextTagTable + self._tag_table = RichTextTagTable() + return self._tag_table + + # 在 keepnote.py/__init__.py 的 KeepNoteApplication 类中 + def do_activate(self, *args): + # Delay the import of `keepnote.gui` until it's needed + print("✅ Entering do_activate with args:") + try: + import keepnote.gui + from keepnote.gui.main_window import KeepNoteWindow # Ensure the class is imported correctly + except ImportError as e: + print(f"ERROR: Failed to import keepnote.gui: {e}") + raise + log_message(f"✅ Entering do_activate with args: {args}\n") + try: + # 防止重复激活 + if self._activated: + print("⚠️ Application already activated, presenting existing window") + if self._windows: + self._windows[0].present() + log_message(f"ℹ️ Window presented (id: {self._windows[0]})\n") + return + + self._activated = True + print("✅ Marked as activated") + # 创建新窗口 + print("🧱 Constructing KeepNoteWindow...") + window = KeepNoteWindow(self._app) + print("✅ KeepNoteWindow created") + self.add_window(window) # ✅ 保证 Gtk.Application 不会退出 + self._windows.append(window) + window.set_application(self) + window.present() + # 加载菜单 + builder = Gtk.Builder() + menu_ui_path = os.path.join(keepnote.get_basedir(), "rc", "menu.ui") + if os.path.exists(menu_ui_path): + builder.add_from_file(menu_ui_path) + menu = builder.get_object("app_menu") + if menu: + popover = Gtk.PopoverMenu() + popover.set_menu_model(menu) + # 假设 menu_button 在 KeepNoteWindow 中 + menu_button = window.get_widget("menu_button") if hasattr(window, 'get_widget') else None + if menu_button: + menu_button.set_popover(popover) + print("✅ Menu loaded and attached to menu_button") + log_message("✅ Menu loaded and set to menu_button\n") + else: + log_message("⚠️ menu_button not found in UI\n") + else: + log_message("⚠️ app_menu not found in menu.ui\n") + else: + log_message(f"⚠️ menu.ui not found at: {menu_ui_path}\n") + + # 呈现窗口 + window.present() + log_message(f"✅ New window created (id: {window._winid}) and presented\n") + + + # 执行命令 + # need_gui = self._app.execute_command(sys.argv) + need_gui = True # Always launch GUI + log_message(f"ℹ️ Window presented (id: {self._windows[0]})") + print("✅ do_activate() 完成，主窗口应该已展示") + + except Exception as e: + exc_type, exc_value, tracebk = sys.exc_info() + log_error(exc_value, tracebk) + # 保持主循环运行 + return + + def get_node(self, uid): + # 兼容接口，用于提供 get_node 方法 + if hasattr(self, "notebook") and self.notebook: + return self.notebook.get_node(uid) + return None + + def error(self, text, error=None, tracebk=None): + from keepnote import log_message, log_error + """ + 用于统一打印错误信息（主窗口或后台异常）。 + """ + log_message(text + "\n") + if error is not None: + log_error(error, tracebk) + + def do_startup(self): + Gtk.Application.do_startup(self) + + + def get_windows(self): + return self._windows + + def new_window(self): + window = keepnote.gui.KeepNoteWindow(self._app) + self.add_window(window) # 告诉 Gtk.Application 它需要保持这个窗口存在 + self._windows.append(window) + window.set_application(self) + window.present() + return window - def get_depends(self): - """Application has no dependencies, returns []""" - return [] + def get_current_window(self): + return self._windows[0] if self._windows else None \ No newline at end of file diff --git a/keepnote/cache.py b/keepnote/cache.py index 7e66575f8..eee4e3379 100644 --- a/keepnote/cache.py +++ b/keepnote/cache.py @@ -5,26 +5,6 @@ """ - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports from heapq import heappop diff --git a/keepnote/commands.py b/keepnote/commands.py index d63f7f73c..18d57b0a6 100644 --- a/keepnote/commands.py +++ b/keepnote/commands.py @@ -5,39 +5,20 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python libs import errno import os import random import socket import sys -import thread +import _thread -# keepnote libs +# keepnote.py libs import keepnote # constants -KEEPNOTE_HEADER = "keepnote\n" +KEEPNOTE_HEADER = "keepnote.py\n" #KEEPNOTE_EOF = "\x00" #KEEPNOTE_ESCAPE = "\xff" @@ -61,13 +42,13 @@ def get_lock_file(lockfile): while True: try: # try to create file with exclusive access - fd = os.open(lockfile, os.O_CREAT | os.O_EXCL | os.O_RDWR, 0600) + fd = os.open(lockfile, os.O_CREAT | os.O_EXCL | os.O_RDWR, 0o600) # creation succeeded, we have the lock acquire = True break - except OSError, e: + except OSError as e: if e.errno != errno.EEXIST: # unknown error, re-raise raise @@ -79,7 +60,7 @@ def get_lock_file(lockfile): acquire = False break - except OSError, e: + except OSError as e: if e.errno != errno.ENOENT: # unknown error, re-raise raise @@ -130,8 +111,8 @@ def open_socket(port=None, start_port=4000, end_port=10000, tries=10): s.bind(("localhost", port2)) s.listen(1) break - except socket.error, e: - print >>sys.stderr, "could not open socket:", str(e) + except socket.error as e: + print("could not open socket:", str(e), file=sys.stderr) port2 = None if port2 is None: @@ -156,7 +137,7 @@ def listen_commands(sock, connfunc, args): except socket.error: continue - thread.start_new_thread(connfunc, (conn, addr) + args) + _thread.start_new_thread(connfunc, (conn, addr) + args) def process_connection(conn, addr, passwd, execfunc): @@ -201,9 +182,9 @@ def process_connection(conn, addr, passwd, execfunc): conn.shutdown(socket.SHUT_RDWR) conn.close() - except socket.error, e: + except socket.error as e: # socket error, close connection - print >>sys.stderr, e, ": error with connection" + print(e, ": error with connection", file=sys.stderr) conn.close() @@ -251,7 +232,7 @@ def escape(text): def split_args(text): args = [] last = 0 - for i in xrange(len(text)): + for i in range(len(text)): if text[i] == " " and (i == 0 or text[i-1] != "\\"): args.append(text[last:i]) last = i + 1 @@ -297,7 +278,7 @@ def _listen(self, fd, execfunc): self._execfunc = execfunc # start listening to socket for remote commands - thread.start_new_thread(listen_commands, + _thread.start_new_thread(listen_commands, (sock, process_connection, (passwd, self.execute))) @@ -401,139 +382,3 @@ def get_command_executor(func, port=None): cmd_exec = CommandExecutor() return main_proc, cmd_exec - - -#============================================================================= -# old code - -''' -# TODO: maybe not needed -class QuotedOutput (object): - def __init__(self, out): - self.__out = out - self.mode = out.mode - - def write(self, text): - for c in format_result(text): - self.__out.write(c) - - def closed(self): - return self.__out.closed() - - def flush(self): - self.__out.flush() - -# TODO: maybe not needed -def format_result(result): - - for c in result: - if c == KEEPNOTE_EOF or c == KEEPNOTE_ESCAPE: - yield KEEPNOTE_ESCAPE - yield c - -# TODO: maybe not needed -def parse_result(result): - """ - Parse result text - - The end of the socket stream is determined by this syntax - - Let $ be \x00 - Let \ be \xff - - abc$ => abc - abc\$def$ => abc$def - abc\\$ => abc\ - abcd\\\$def$ => abc\$def - - """ - - escape = False - - for c in result: - if not escape and c == KEEPNOTE_ESCAPE: - # begin escape mode, next char - escape = True - continue - else: - # end escape mode - escape = False - - if not escape and c == KEEPNOTE_EOF: - # end of file - break - - # output char - yield c - -''' - - -''' -# dbus -try: - import dbus - import dbus.bus - import dbus.service - import dbus.mainloop.glib - -except ImportError: - dbus = None - - -APP_NAME = "org.ods.rasm.KeepNote" - - - -class SimpleCommandExecutor (object): - def __init__(self, exec_func): - self.app = None - self.exec_func = exec_func - - def set_app(self, app): - self.app = app - - def execute(self, argv): - if self.app: - self.exec_func(self.app, argv) - - -if dbus: - class CommandExecutor (dbus.service.Object): - def __init__(self, bus, path, name, exec_func): - dbus.service.Object.__init__(self, bus, path, name) - self.app = None - self.exec_func = exec_func - - def set_app(self, app): - self.app = app - - @dbus.service.method(APP_NAME, in_signature='as', out_signature='') - def execute(self, argv): - # send command to app - - if self.app: - self.exec_func(self.app, argv) - - -def get_command_executor(listen, exec_func): - - # setup dbus - if not dbus or not listen: - return True, SimpleCommandExecutor(exec_func) - - # setup glib as main loop - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) - - # get bus session - bus = dbus.SessionBus() - - # test to see if KeepNote is already running - if bus.request_name(APP_NAME, dbus.bus.NAME_FLAG_DO_NOT_QUEUE) != \ - dbus.bus.REQUEST_NAME_REPLY_EXISTS: - return True, CommandExecutor(bus, '/', APP_NAME, exec_func) - else: - obj = bus.get_object(APP_NAME, "/") - ce = dbus.Interface(obj, APP_NAME) - return False, ce -''' diff --git a/keepnote/compat/__init__.py b/keepnote/compat/__init__.py index 2cb7d8500..e69de29bb 100644 --- a/keepnote/compat/__init__.py +++ b/keepnote/compat/__init__.py @@ -1,18 +0,0 @@ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# diff --git a/keepnote/compat/notebook_connection_fs_index_v4.py b/keepnote/compat/notebook_connection_fs_index_v4.py index c3953961b..582ecab40 100644 --- a/keepnote/compat/notebook_connection_fs_index_v4.py +++ b/keepnote/compat/notebook_connection_fs_index_v4.py @@ -5,26 +5,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - # python imports from itertools import chain import os @@ -36,19 +16,19 @@ try: import pysqlite2 import pysqlite2.dbapi2 as sqlite -except Exception, e: +except Exception as e: import sqlite3 as sqlite #sqlite.enable_shared_cache(True) #sqlite.threadsafety = 0 -# keepnote imports +# keepnote.py imports import keepnote # index filename -INDEX_FILE = u"index.sqlite" +INDEX_FILE = "index.sqlite" INDEX_VERSION = 3 @@ -69,7 +49,7 @@ def match_words(infile, words): matches[word] = True # return True if all words are found (AND) - for val in matches.itervalues(): + for val in matches.values(): if not val: return False @@ -105,22 +85,22 @@ def init(self, cur): # multivalue is not implemented yet assert not self._multivalue - cur.execute(u"""CREATE TABLE IF NOT EXISTS %s + cur.execute("""CREATE TABLE IF NOT EXISTS %s (nodeid TEXT, value %s, UNIQUE(nodeid) ON CONFLICT REPLACE); """ % (self._table_name, self._type)) - cur.execute(u"""CREATE INDEX IF NOT EXISTS %s + cur.execute("""CREATE INDEX IF NOT EXISTS %s ON %s (nodeid);""" % (self._index_name, self._table_name)) if self._index_value: - cur.execute(u"""CREATE INDEX IF NOT EXISTS %s + cur.execute("""CREATE INDEX IF NOT EXISTS %s ON %s (value);""" % (self._index_value_name, self._table_name)) def drop(self, cur): - cur.execute(u"DROP TABLE IF EXISTS %s" % self._table_name) + cur.execute("DROP TABLE IF EXISTS %s" % self._table_name) def add_node(self, cur, nodeid, attr): @@ -131,13 +111,13 @@ def add_node(self, cur, nodeid, attr): def remove_node(self, cur, nodeid): """Remove node from index""" - cur.execute(u"DELETE FROM %s WHERE nodeid=?" % self._table_name, + cur.execute("DELETE FROM %s WHERE nodeid=?" % self._table_name, (nodeid,)) def get(self, cur, nodeid): """Get information for a node from the index""" - cur.execute(u"""SELECT value FROM %s WHERE nodeid = ?""" % + cur.execute("""SELECT value FROM %s WHERE nodeid = ?""" % self._table_name, (nodeid,)) values = [row[0] for row in cur.fetchall()] @@ -154,7 +134,7 @@ def set(self, cur, nodeid, value): """Set the information for a node in the index""" # insert new row - cur.execute(u"""INSERT INTO %s VALUES (?, ?)""" % self._table_name, + cur.execute("""INSERT INTO %s VALUES (?, ?)""" % self._table_name, (nodeid, value)) @@ -198,7 +178,7 @@ def open(self, auto_clear=True): #self.con.execute(u"PRAGMA read_uncommitted = true;") self.init_index(auto_clear=auto_clear) - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -230,7 +210,7 @@ def save(self): self.con.commit() except: self.open() - except Exception, e: + except Exception as e: self._on_corrupt(e, sys.exc_info()[2]) @@ -251,9 +231,9 @@ def clear(self): def _get_version(self): """Get version from database""" - self.con.execute(u"""CREATE TABLE IF NOT EXISTS Version + self.con.execute("""CREATE TABLE IF NOT EXISTS Version (version INTEGER, update_date DATE);""") - version = self.con.execute(u"SELECT MAX(version) FROM Version").fetchone() + version = self.con.execute("SELECT MAX(version) FROM Version").fetchone() if version is not None: version = version[0] return version @@ -261,7 +241,7 @@ def _get_version(self): def _set_version(self, version=INDEX_VERSION): """Set the version of the database""" - self.con.execute(u"INSERT INTO Version VALUES (?, datetime('now'));", + self.con.execute("INSERT INTO Version VALUES (?, datetime('now'));", (version,)) @@ -283,7 +263,7 @@ def init_index(self, auto_clear=True): # init NodeGraph table - con.execute(u"""CREATE TABLE IF NOT EXISTS NodeGraph + con.execute("""CREATE TABLE IF NOT EXISTS NodeGraph (nodeid TEXT, parentid TEXT, basename TEXT, @@ -292,29 +272,29 @@ def init_index(self, auto_clear=True): UNIQUE(nodeid) ON CONFLICT REPLACE); """) - con.execute(u"""CREATE INDEX IF NOT EXISTS IdxNodeGraphNodeid + con.execute("""CREATE INDEX IF NOT EXISTS IdxNodeGraphNodeid ON NodeGraph (nodeid);""") - con.execute(u"""CREATE INDEX IF NOT EXISTS IdxNodeGraphParentid + con.execute("""CREATE INDEX IF NOT EXISTS IdxNodeGraphParentid ON NodeGraph (parentid);""") # full text table try: # test for fts3 availability - con.execute(u"DROP TABLE IF EXISTS fts3test;") + con.execute("DROP TABLE IF EXISTS fts3test;") con.execute( "CREATE VIRTUAL TABLE fts3test USING fts3(col TEXT);") con.execute("DROP TABLE fts3test;") # create fulltext table if it does not already exist - if not list(con.execute(u"""SELECT 1 FROM sqlite_master + if not list(con.execute("""SELECT 1 FROM sqlite_master WHERE name == 'fulltext';""")): - con.execute(u"""CREATE VIRTUAL TABLE + con.execute("""CREATE VIRTUAL TABLE fulltext USING fts3(nodeid TEXT, content TEXT, tokenize=porter);""") self._has_fulltext = True - except Exception, e: + except Exception as e: keepnote.log_error(e) self._has_fulltext = False @@ -327,7 +307,7 @@ def init_index(self, auto_clear=True): # """) # initialize attribute tables - for attr in self._attrs.itervalues(): + for attr in self._attrs.values(): attr.init(self.cur) con.commit() @@ -336,7 +316,7 @@ def init_index(self, auto_clear=True): #if not self._need_index: # self._need_index = self.check_index() - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) keepnote.log_message("reinitializing index '%s'\n" % @@ -382,17 +362,17 @@ def add_attr(self, attr): def _drop_tables(self): """drop NodeGraph tables""" - self.con.execute(u"DROP TABLE IF EXISTS NodeGraph") - self.con.execute(u"DROP INDEX IF EXISTS IdxNodeGraphNodeid") - self.con.execute(u"DROP INDEX IF EXISTS IdxNodeGraphParentid") - self.con.execute(u"DROP TABLE IF EXISTS fulltext;") + self.con.execute("DROP TABLE IF EXISTS NodeGraph") + self.con.execute("DROP INDEX IF EXISTS IdxNodeGraphNodeid") + self.con.execute("DROP INDEX IF EXISTS IdxNodeGraphParentid") + self.con.execute("DROP TABLE IF EXISTS fulltext;") # drop attribute tables table_names = [x for (x,) in self.con.execute( - u"""SELECT name FROM sqlite_master WHERE name LIKE 'Attr_%'""")] + """SELECT name FROM sqlite_master WHERE name LIKE 'Attr_%'""")] for table_name in table_names: - self.con.execute(u"""DROP TABLE %s;""" % table_name) + self.con.execute("""DROP TABLE %s;""" % table_name) @@ -447,7 +427,7 @@ def preorder(conn, nodeid): def get_node_mtime(self, nodeid): - self.cur.execute(u"""SELECT mtime FROM NodeGraph + self.cur.execute("""SELECT mtime FROM NodeGraph WHERE nodeid=?""", (nodeid,)) row = self.cur.fetchone() if row: @@ -481,23 +461,23 @@ def add_node(self, nodeid, parentid, basename, attr, mtime): # get info if parentid is None: parentid = self._uniroot - basename = u"" + basename = "" symlink = False # update nodegraph self.cur.execute( - u"""INSERT INTO NodeGraph VALUES (?, ?, ?, ?, ?)""", + """INSERT INTO NodeGraph VALUES (?, ?, ?, ?, ?)""", (nodeid, parentid, basename, mtime, symlink)) # update attrs - for attrindex in self._attrs.itervalues(): + for attrindex in self._attrs.values(): attrindex.add_node(self.cur, nodeid, attr) # update fulltext infile = self._nconn.read_data_as_plain_text(nodeid) self.index_node_text(nodeid, attr, infile) - except Exception, e: + except Exception as e: keepnote.log_error("error index node %s '%s'" % (nodeid, attr.get("title", ""))) self._on_corrupt(e, sys.exc_info()[2]) @@ -511,10 +491,10 @@ def remove_node(self, nodeid): try: # delete node - self.cur.execute(u"DELETE FROM NodeGraph WHERE nodeid=?", (nodeid,)) + self.cur.execute("DELETE FROM NodeGraph WHERE nodeid=?", (nodeid,)) # update attrs - for attr in self._attrs.itervalues(): + for attr in self._attrs.values(): attr.remove_node(self.cur, nodeid) # delete children @@ -522,7 +502,7 @@ def remove_node(self, nodeid): # u"SELECT nodeid FROM NodeGraph WHERE parentid=?", (nodeid,)): # self.remove_node(childid) - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) @@ -531,7 +511,7 @@ def index_node_text(self, nodeid, attr, infile): try: text = attr.get("title", "") + "\n" + "".join(infile) self.insert_text(nodeid, text) - except Exception, e: + except Exception as e: keepnote.log_error() @@ -540,13 +520,13 @@ def insert_text(self, nodeid, text): if not self._has_fulltext: return - if list(self.cur.execute(u"SELECT 1 FROM fulltext WHERE nodeid = ?", + if list(self.cur.execute("SELECT 1 FROM fulltext WHERE nodeid = ?", (nodeid,))): self.cur.execute( - u"UPDATE fulltext SET content = ? WHERE nodeid = ?;", + "UPDATE fulltext SET content = ? WHERE nodeid = ?;", (text, nodeid)) else: - self.cur.execute(u"INSERT INTO fulltext VALUES (?, ?);", + self.cur.execute("INSERT INTO fulltext VALUES (?, ?);", (nodeid, text)) @@ -568,7 +548,7 @@ def get_node_path(self, nodeid): # continue to walk up parent path.append(nodeid) - self.cur.execute(u"""SELECT nodeid, parentid, basename + self.cur.execute("""SELECT nodeid, parentid, basename FROM NodeGraph WHERE nodeid=?""", (nodeid,)) row = self.cur.fetchone() @@ -590,7 +570,7 @@ def get_node_path(self, nodeid): path.reverse() return path - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -608,7 +588,7 @@ def get_node_filepath(self, nodeid): while parentid != self._uniroot: # continue to walk up parent - self.cur.execute(u"""SELECT nodeid, parentid, basename + self.cur.execute("""SELECT nodeid, parentid, basename FROM NodeGraph WHERE nodeid=?""", (nodeid,)) row = self.cur.fetchone() @@ -632,7 +612,7 @@ def get_node_filepath(self, nodeid): path.reverse() return path - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -643,7 +623,7 @@ def get_node(self, nodeid): # TODO: handle multiple parents try: - self.cur.execute(u"""SELECT nodeid, parentid, basename, mtime + self.cur.execute("""SELECT nodeid, parentid, basename, mtime FROM NodeGraph WHERE nodeid=?""", (nodeid,)) row = self.cur.fetchone() @@ -657,14 +637,14 @@ def get_node(self, nodeid): "basename": row[2], "mtime": row[3]} - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise def has_node(self, nodeid): """Returns True if index has node""" - self.cur.execute(u"""SELECT nodeid, parentid, basename, mtime + self.cur.execute("""SELECT nodeid, parentid, basename, mtime FROM NodeGraph WHERE nodeid=?""", (nodeid,)) return self.cur.fetchone() is not None @@ -673,12 +653,12 @@ def has_node(self, nodeid): def list_children(self, nodeid): try: - self.cur.execute(u"""SELECT nodeid, basename + self.cur.execute("""SELECT nodeid, basename FROM NodeGraph WHERE parentid=?""", (nodeid,)) return list(self.cur.fetchall()) - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -686,12 +666,12 @@ def list_children(self, nodeid): def has_children(self, nodeid): try: - self.cur.execute(u"""SELECT nodeid + self.cur.execute("""SELECT nodeid FROM NodeGraph WHERE parentid=?""", (nodeid,)) return self.cur.fetchone() != None - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -705,14 +685,14 @@ def search_titles(self, query): try: # order titles by exact matches and then alphabetically self.cur.execute( - u"""SELECT nodeid, value FROM %s WHERE value LIKE ? + """SELECT nodeid, value FROM %s WHERE value LIKE ? ORDER BY value != ?, value """ % self._attrs["title"].get_table_name(), - (u"%" + query + u"%", query)) + ("%" + query + "%", query)) return list(self.cur.fetchall()) - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise diff --git a/keepnote/compat/notebook_connection_fs_v4.py b/keepnote/compat/notebook_connection_fs_v4.py index 3e01ecfb4..8b0123659 100644 --- a/keepnote/compat/notebook_connection_fs_v4.py +++ b/keepnote/compat/notebook_connection_fs_v4.py @@ -5,26 +5,6 @@ Low-level Create-Read-Update-Delete (CRUD) interface for notebooks. """ - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - """ Strategy for detecting unmanaged notebook modifications, which I also call tampering. @@ -71,21 +51,17 @@ # python imports import gettext -import mimetypes import os -import sys import shutil import re -import traceback -from os.path import join, isdir, isfile -from os import listdir +from os.path import join # xml imports from xml.sax.saxutils import escape import xml.etree.cElementTree as ET -# keepnote imports +# keepnote.py imports from keepnote import safefile from keepnote import trans import keepnote.compat.notebook_connection_fs_index_v4 as notebook_index @@ -100,13 +76,13 @@ # constants -XML_HEADER = u"""\ +XML_HEADER = """\ """ -NODE_META_FILE = u"node.xml" -NOTEBOOK_META_DIR = u"__NOTEBOOK__" -LOSTDIR = u"lost_found" +NODE_META_FILE = "node.xml" +NOTEBOOK_META_DIR = "__NOTEBOOK__" +LOSTDIR = "lost_found" MAX_LEN_NODE_FILENAME = 40 @@ -138,9 +114,9 @@ def path_local2node(filename): aaa\bbb\ccc => aaa/bbb/ccc """ - if os.path.sep == u"/": + if os.path.sep == "/": return filename - return filename.replace(os.path.sep, u"/") + return filename.replace(os.path.sep, "/") def path_node2local(filename): @@ -156,9 +132,9 @@ def path_node2local(filename): aaa/bbb/ccc => aaa\bbb\ccc """ - if os.path.sep == u"/": + if os.path.sep == "/": return filename - return filename.replace(u"/", os.path.sep) + return filename.replace("/", os.path.sep) def get_node_filename(node_path, filename): @@ -174,11 +150,11 @@ def get_node_filename(node_path, filename): #============================================================================= # functions for ensuring valid filenames in notebooks -REGEX_SLASHES = re.compile(ur"[/\\]") -REGEX_BAD_CHARS = re.compile(ur"[\?'&<>|`:;]") -REGEX_LEADING_UNDERSCORE = re.compile(ur"^__+") +REGEX_SLASHES = re.compile(r"[/\\]") +REGEX_BAD_CHARS = re.compile(r"[\?'&<>|`:;]") +REGEX_LEADING_UNDERSCORE = re.compile(r"^__+") -def get_valid_filename(filename, default=u"folder", +def get_valid_filename(filename, default="folder", maxlen=MAX_LEN_NODE_FILENAME): """ Converts a filename into a valid one @@ -187,16 +163,16 @@ def get_valid_filename(filename, default=u"folder", """ filename = filename[:maxlen] - filename = re.sub(REGEX_SLASHES, u"-", filename) - filename = re.sub(REGEX_BAD_CHARS, u"", filename) - filename = filename.replace(u"\t", " ") - filename = filename.strip(u" \t.") + filename = re.sub(REGEX_SLASHES, "-", filename) + filename = re.sub(REGEX_BAD_CHARS, "", filename) + filename = filename.replace("\t", " ") + filename = filename.strip(" \t.") # don't allow files to start with two underscores - filename = re.sub(REGEX_LEADING_UNDERSCORE, u"", filename) + filename = re.sub(REGEX_LEADING_UNDERSCORE, "", filename) # don't allow pure whitespace filenames - if filename == u"": + if filename == "": filename = default # use only lower case, some filesystems have trouble with mixed case @@ -206,7 +182,7 @@ def get_valid_filename(filename, default=u"folder", -def get_valid_unique_filename(path, filename, ext=u"", sep=u" ", number=2): +def get_valid_unique_filename(path, filename, ext="", sep=" ", number=2): """Returns a valid and unique version of a filename for a given path""" return keepnote.compat.notebook_v4.get_unique_filename( path, get_valid_filename(filename), ext, sep, number) @@ -224,7 +200,7 @@ def iter_child_node_paths(path): for child in children: child_path = os.path.join(path, child) - if os.path.isfile(os.path.join(child_path, u"node.xml")): + if os.path.isfile(os.path.join(child_path, "node.xml")): yield child_path @@ -252,8 +228,8 @@ def last_node_change(path): for dirpath, dirnames, filenames in os.walk(path): mtime = max(mtime, stat(dirpath).st_mtime) - if u"node.xml" in filenames: - mtime = max(mtime, stat(join(dirpath, u"node.xml")).st_mtime) + if "node.xml" in filenames: + mtime = max(mtime, stat(join(dirpath, "node.xml")).st_mtime) return mtime @@ -312,7 +288,7 @@ class PathCache (object): An in-memory cache of filesystem paths for nodeids """ - def __init__(self, rootid=None, rootpath=u""): + def __init__(self, rootid=None, rootpath=""): self._nodes = {None: None} if rootid: @@ -565,14 +541,14 @@ def _move_to_lostdir(self, filename): os.makedirs(lostdir) new_filename = keepnote.compat.notebook_v4.get_unique_filename( - lostdir, os.path.basename(filename), sep=u"-") + lostdir, os.path.basename(filename), sep="-") - keepnote.log_message(u"moving data to lostdir '%s' => '%s'\n" % + keepnote.log_message("moving data to lostdir '%s' => '%s'\n" % (filename, new_filename)) try: os.rename(filename, new_filename) - except OSError, e: - raise ConnectionError(u"unable to store lost file '%s'" + except OSError as e: + raise ConnectionError("unable to store lost file '%s'" % filename, e) #====================== @@ -654,7 +630,7 @@ def create_node(self, nodeid, attr, _path=None, _root=False): self._write_attr(self._get_node_attr_file(nodeid, path), attr, self._attr_defs) self._path_cache.add(nodeid, basename, parentid) - except OSError, e: + except OSError as e: raise keepnote.compat.notebook_v4.NoteBookError(_("Cannot create node"), e) # update index @@ -715,7 +691,7 @@ def update_node(self, nodeid, attr): # move to a new parent self._rename_node_dir(nodeid, attr, parentid, parentid2, path) elif (parentid and title_index and - title_index != attr.get("title", u"")): + title_index != attr.get("title", "")): # rename node directory, but # do not rename root node dir (parentid is None) self._rename_node_dir(nodeid, attr, parentid, parentid2, path) @@ -736,9 +712,9 @@ def _rename_node_dir(self, nodeid, attr, parentid, new_parentid, path): try: os.rename(path, new_path) - except OSError, e: + except OSError as e: raise keepnote.compat.notebook_v4.NoteBookError( - _(u"Cannot rename '%s' to '%s'" % (path, new_path)), e) + _("Cannot rename '%s' to '%s'" % (path, new_path)), e) # update index basename = os.path.basename(new_path) @@ -762,9 +738,9 @@ def delete_node(self, nodeid): try: shutil.rmtree(self._get_node_path(nodeid)) - except OSError, e: + except OSError as e: raise keepnote.compat.notebook_v4.NoteBookError( - _(u"Do not have permission to delete"), e) + _("Do not have permission to delete"), e) # TODO: remove from index entire subtree @@ -799,7 +775,7 @@ def _list_children_attr(self, nodeid, _path=None, _full=True): files = os.listdir(path) except: raise keepnote.compat.notebook_v4.NoteBookError( - _(u"Do not have permission to read folder contents: %s") + _("Do not have permission to read folder contents: %s") % path, e) for filename in files: @@ -807,8 +783,8 @@ def _list_children_attr(self, nodeid, _path=None, _full=True): if os.path.exists(get_node_meta_file(path2)): try: yield self._read_node(nodeid, path2, _full=_full) - except keepnote.compat.notebook_v4.NoteBookError, e: - keepnote.log_error(u"error reading %s" % path2) + except keepnote.compat.notebook_v4.NoteBookError as e: + keepnote.log_error("error reading %s" % path2) continue # TODO: raise warning, not all children read @@ -891,7 +867,7 @@ def _reindex_node(self, nodeid, parentid, path, attr, mtime, warn=True): if warn: keepnote.log_message( - u"Unmanaged change detected. Reindexing '%s'\n" % path) + "Unmanaged change detected. Reindexing '%s'\n" % path) # TODO: to prevent a full recurse I could index children but # use 0 for mtime, so that they will still trigger an index for them @@ -922,33 +898,33 @@ def _write_attr(self, filename, attr, attr_defs): try: out = safefile.open(filename, "w", codec="utf-8") out.write(XML_HEADER) - out.write(u"\n" - u"%s\n" % + out.write("\n" + "%s\n" % keepnote.compat.notebook_v4.NOTEBOOK_FORMAT_VERSION) - for key, val in attr.iteritems(): + for key, val in attr.items(): if key in self._attr_suppress: continue attr_def = attr_defs.get(key, None) if attr_def is not None: - out.write(u'%s\n' % + out.write('%s\n' % (key, escape(attr_def.write(val)))) elif key == "version": # skip version attr pass elif isinstance(val, keepnote.compat.notebook_v4.UnknownAttr): # write unknown attrs if they are strings - out.write(u'%s\n' % + out.write('%s\n' % (key, escape(val.value))) else: # drop attribute pass - out.write(u"\n") + out.write("\n") out.close() - except Exception, e: + except Exception as e: raise keepnote.compat.notebook_v4.NoteBookError( _("Cannot write meta data"), e) @@ -960,13 +936,13 @@ def _read_attr(self, filename, attr_defs, recover=True): try: tree = ET.ElementTree(file=filename) - except Exception, e: + except Exception as e: if recover: self._recover_attr(filename) return self._read_attr(filename, attr_defs, recover=False) raise keepnote.compat.notebook_v4.NoteBookError( - _(u"Error reading meta data file '%s'" % filename), e) + _("Error reading meta data file '%s'" % filename), e) # check root root = tree.getroot() @@ -999,7 +975,7 @@ def _recover_attr(self, filename): out.write("") out.close() except: - keepnote.log_error(u"failed to recover '%s'" % filename) + keepnote.log_error("failed to recover '%s'" % filename) pass @@ -1168,7 +1144,7 @@ def copy_node_file(self, nodeid1, filename1, nodeid2, filename2, shutil.copytree(fullname1, fullname2) - def new_filename(self, nodeid, new_filename, ext=u"", sep=u" ", number=2, + def new_filename(self, nodeid, new_filename, ext="", sep=" ", number=2, return_number=False, use_number=False, ensure_valid=True, _path=None): @@ -1249,7 +1225,7 @@ def index_attr(self, key, index_value=False): datatype = self._attr_defs[key].datatype - if issubclass(datatype, basestring): + if issubclass(datatype, str): index_type = "TEXT" elif issubclass(datatype, int): index_type = "INTEGER" diff --git a/keepnote/compat/notebook_connection_v4.py b/keepnote/compat/notebook_connection_v4.py index 56d841def..579c64fd1 100644 --- a/keepnote/compat/notebook_connection_v4.py +++ b/keepnote/compat/notebook_connection_v4.py @@ -6,40 +6,16 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -#============================================================================= -# errors - - -class ConnectionError (StandardError): +class ConnectionError (Exception): def __init__(self, msg, error=None): - StandardError.__init__(self, msg) + Exception.__init__(self, msg) self.error = error def repr(self): if self.error is not None: - return StandardError.repr(self) + ": " + repr(self.error) + return Exception.repr(self) + ": " + repr(self.error) else: - return StandardError.repr(self) + return Exception.repr(self) class UnknownNode (ConnectionError): def __init__(self, msg="unknown node"): @@ -208,7 +184,7 @@ def copy_files(self, nodeid1, nodeid2): # Is this needed inside the connection? Can it be support outside? - def new_filename(self, nodeid, new_filename, ext=u"", sep=u" ", number=2, + def new_filename(self, nodeid, new_filename, ext="", sep=" ", number=2, return_number=False, use_number=False, ensure_valid=True): pass diff --git a/keepnote/compat/notebook_update_v1_2.py b/keepnote/compat/notebook_update_v1_2.py index ea1643e17..e77721d9b 100644 --- a/keepnote/compat/notebook_update_v1_2.py +++ b/keepnote/compat/notebook_update_v1_2.py @@ -5,25 +5,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - import os from xml.sax.saxutils import escape @@ -92,7 +73,7 @@ def walk(node): write_meta_data(node) - except Exception, e: + except Exception as e: if not warn(e): raise notebooklib.NoteBookError("Could not update notebook", e) @@ -122,7 +103,7 @@ def write_meta_data(node): out.write("\n" "2\n") - for key, val in node._attr.iteritems(): + for key, val in node._attr.items(): attr = node._notebook.notebook_attrs.get(key, None) if attr is not None: @@ -134,6 +115,6 @@ def write_meta_data(node): out.write("\n") out.close() - except Exception, e: + except Exception as e: raise notebooklib.NoteBookError("Cannot write meta data", e) diff --git a/keepnote/compat/notebook_update_v5_6.py b/keepnote/compat/notebook_update_v5_6.py index 113c5b834..5a31fd73a 100644 --- a/keepnote/compat/notebook_update_v5_6.py +++ b/keepnote/compat/notebook_update_v5_6.py @@ -5,26 +5,10 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# import os,sys +import uuid + import keepnote from keepnote import safefile, plist from keepnote.timestamp import get_timestamp @@ -33,7 +17,7 @@ def new_nodeid(): """Generate a new node id""" - return unicode(uuid.uuid4()) + return str(uuid.uuid4()) def iter_child_node_paths(path): @@ -43,7 +27,7 @@ def iter_child_node_paths(path): for child in children: child_path = os.path.join(path, child) - if os.path.isfile(os.path.join(child_path, u"node.xml")): + if os.path.isfile(os.path.join(child_path, "node.xml")): yield child_path @@ -67,9 +51,9 @@ def __init__(self, key, datatype, name, default=None): # writer function if datatype == bool: - self.write = lambda x: unicode(int(x)) + self.write = lambda x: str(int(x)) else: - self.write = unicode + self.write = str # reader function if datatype == bool: @@ -86,21 +70,21 @@ def __init__(self, value): g_default_attr_defs = [ - AttrDef("nodeid", unicode, "Node ID", default=new_nodeid), - AttrDef("content_type", unicode, "Content type", + AttrDef("nodeid", str, "Node ID", default=new_nodeid), + AttrDef("content_type", str, "Content type", default=lambda: CONTENT_TYPE_DIR), - AttrDef("title", unicode, "Title"), - AttrDef("order", int, "Order", default=lambda: sys.maxint), + AttrDef("title", str, "Title"), + AttrDef("order", int, "Order", default=lambda: sys.maxsize), AttrDef("created_time", int, "Created time", default=get_timestamp), AttrDef("modified_time", int, "Modified time", default=get_timestamp), AttrDef("expanded", bool, "Expaned", default=lambda: True), AttrDef("expanded2", bool, "Expanded2", default=lambda: True), - AttrDef("info_sort", unicode, "Folder sort", default=lambda: "order"), + AttrDef("info_sort", str, "Folder sort", default=lambda: "order"), AttrDef("info_sort_dir", int, "Folder sort direction", default=lambda: 1), - AttrDef("icon", unicode, "Icon"), - AttrDef("icon_open", unicode, "Icon open"), - AttrDef("payload_filename", unicode, "Filename"), - AttrDef("duplicate_of", unicode, "Duplicate of") + AttrDef("icon", str, "Icon"), + AttrDef("icon_open", str, "Icon open"), + AttrDef("payload_filename", str, "Filename"), + AttrDef("duplicate_of", str, "Duplicate of") ] g_attr_defs_lookup = dict((attr.key, attr) for attr in g_default_attr_defs) @@ -143,11 +127,11 @@ def read_attr_v5(filename, attr_defs=g_attr_defs_lookup): def write_attr_v6(filename, attr): out = safefile.open(filename, "w", codec="utf-8") - out.write(u'\n' - u'\n' - u'%d\n' % attr["version"]) + out.write('\n' + '\n' + '%d\n' % attr["version"]) plist.dump(attr, out, indent=2, depth=0) - out.write(u'\n') + out.write('\n') out.close() @@ -160,7 +144,7 @@ def convert_node_attr(filename, filename2, attr_defs=g_attr_defs_lookup): attr = read_attr_v5(filename, attr_defs) attr["version"] = 6 write_attr_v6(filename2, attr) - except Exception, e: + except Exception as e: keepnote.log_error("cannot convert %s: %s\n" % (filename, str(e)), sys.exc_info()[2]) @@ -168,17 +152,17 @@ def convert_node_attr(filename, filename2, attr_defs=g_attr_defs_lookup): def update(filename): - filename = unicode(filename) + filename = str(filename) def walk(path): - nodepath = os.path.join(path, u"node.xml") + nodepath = os.path.join(path, "node.xml") convert_node_attr(nodepath, nodepath) for path2 in iter_child_node_paths(path): walk(path2) walk(filename) - preffile = os.path.join(filename, u"notebook.nbk") + preffile = os.path.join(filename, "notebook.nbk") etree = ET.ElementTree(file=preffile) root = etree.getroot() root.find("version").text = "6" diff --git a/keepnote/compat/notebook_v1.py b/keepnote/compat/notebook_v1.py index 8f46edc8e..a00c4e266 100644 --- a/keepnote/compat/notebook_v1.py +++ b/keepnote/compat/notebook_v1.py @@ -5,30 +5,11 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - # python imports import os, sys, shutil, time, re +import xml -# keepnote imports +# keepnote.py imports import keepnote.compat.xmlobject_v1 as xmlo from keepnote.listening import Listeners from keepnote.timestamp import \ @@ -66,7 +47,7 @@ INFO_SORT_MANUAL, \ INFO_SORT_TITLE, \ INFO_SORT_CREATED_TIME, \ -INFO_SORT_MODIFIED_TIME = range(5) +INFO_SORT_MODIFIED_TIME = list(range(5)) #============================================================================= @@ -245,11 +226,11 @@ def walk(node): #============================================================================= # classes -class NoteBookError (StandardError): +class NoteBookError (Exception): """Exception that occurs when manipulating NoteBook's""" def __init__(self, msg, error=None): - StandardError.__init__(self) + Exception.__init__(self) self.msg = msg self.error = error @@ -289,9 +270,9 @@ def __init__(self, name, datatype, key=None, write=None, read=None): # writer function if write is None: if datatype == bool: - self.write = lambda x: unicode(int(x)) + self.write = lambda x: str(int(x)) else: - self.write = unicode + self.write = str else: self.write = write @@ -314,8 +295,8 @@ def __init__(self, name): # NoteBooks have tables and attrs g_default_attrs = [ - NoteBookAttr("Title", unicode, "title"), - NoteBookAttr("Kind", unicode, "kind"), + NoteBookAttr("Title", str, "title"), + NoteBookAttr("Kind", str, "kind"), NoteBookAttr("Order", int, "order"), NoteBookAttr("Created", int, "created_time"), NoteBookAttr("Modified", int, "modified_time"), @@ -329,7 +310,7 @@ def __init__(self, name): # TODO: parent might be an implict attr -# 1. attrs should be data that is optional (although keepnote has a few +# 1. attrs should be data that is optional (although keepnote.py has a few # required entries). # 2. attrs can appear in listview @@ -349,7 +330,7 @@ def __init__(self, path, title="", parent=None, notebook=None, kind="dir"): self._attr = { "title": title, "kind": kind, - "order": sys.maxint, + "order": sys.maxsize, "created_time": None, "modified_time": None, "expanded": False, @@ -370,7 +351,7 @@ def create(self): try: os.mkdir(path) - except OSError, e: + except OSError as e: raise NoteBookError("Cannot create node", e) self._attr["created_time"] = get_timestamp() @@ -483,7 +464,7 @@ def move(self, parent, index=None): try: os.rename(path, path2) - except OSError, e: + except OSError as e: raise NoteBookError("Do not have permission for move", e) self._set_basename(path2) @@ -515,7 +496,7 @@ def delete(self): path = self.get_path() try: shutil.rmtree(path) - except OSError, e: + except OSError as e: raise NoteBookError("Do not have permission to delete", e) self._parent._remove_child(self) @@ -590,7 +571,7 @@ def rename(self, title): self._attr["title"] = title self._set_basename(path2) self.save(True) - except (OSError, NoteBookError), e: + except (OSError, NoteBookError) as e: raise NoteBookError("Cannot rename '%s' to '%s'" % (path, path2), e) self.notify_change(False) @@ -631,7 +612,7 @@ def _get_children(self): try: files = os.listdir(path) - except OSError, e: + except OSError as e: raise NoteBookError("Do not have permission to read folder contents", e) for filename in files: @@ -661,7 +642,7 @@ def _get_children(self): self._children.append(node) - except NoteBookError, e: + except NoteBookError as e: continue # TODO: raise warning, not all children read @@ -786,7 +767,7 @@ def write_empty_data_file(self): out = safefile.open(datafile, "w") out.write(BLANK_NOTE) out.close() - except IOError, e: + except IOError as e: raise NoteBookError("Cannot initialize richtext file '%s'" % datafile, e) @@ -807,9 +788,9 @@ def read_meta_data(self): try: self._meta_parser.read(self, self.get_meta_file()) - except IOError, e: + except IOError as e: raise NoteBookError("Cannot read meta data", e) - except xmlo.XmlError, e: + except xmlo.XmlError as e: raise NoteBookError("Node meta data is corrupt for note '%s'" % self.get_path(), e) @@ -829,9 +810,9 @@ def write_meta_data(self): """Write meta data to file-system""" try: self._meta_parser.write(self, self.get_meta_file()) - except IOError, e: + except IOError as e: raise NoteBookError("Cannot write meta data", e) - except xmlo.XmlError, e: + except xmlo.XmlError as e: raise NoteBookError("File format error", e) @@ -842,7 +823,7 @@ def write_meta_data2(self): out.write("\n" "2\n") - for key, val in self._attr.iteritems(): + for key, val in self._attr.items(): attr = self._notebook.notebook_attrs.get(key, None) if attr is not None: @@ -851,7 +832,7 @@ def write_meta_data2(self): out.write("\n") out.close() - except Exception, e: + except Exception as e: raise NoteBookError("Cannot write meta data", e) @@ -876,10 +857,10 @@ def read_meta_data2(self): parser.ParseFile(infile) infile.close() - except xml.parsers.expat.ExpatError, e: + except xml.parsers.expat.ExpatError as e: raise NoteBookError("Cannot read meta data", e) - except Exception, e: + except Exception as e: raise NoteBookError("Cannot read meta data", e) # set defaults @@ -1168,7 +1149,7 @@ def _init_trash(self): self._trash = NoteBookTrash(TRASH_NAME, self) self._trash.create() self._add_child(self._trash) - except NoteBookError, e: + except NoteBookError as e: raise NoteBookError("Cannot create Trash folder", e) @@ -1210,9 +1191,9 @@ def write_preferences(self): os.mkdir(self.get_pref_dir()) g_notebook_pref_parser.write(self.pref, self.get_pref_file()) - except (IOError, OSError), e: + except (IOError, OSError) as e: raise NoteBookError("Cannot save notebook preferences", e) - except xmlo.XmlError, e: + except xmlo.XmlError as e: raise NoteBookError("File format error", e) @@ -1220,9 +1201,9 @@ def read_preferences(self): """Reads the NoteBook's preferneces from the file-system""" try: g_notebook_pref_parser.read(self.pref, self.get_pref_file()) - except IOError, e: + except IOError as e: raise NoteBookError("Cannot read notebook preferences", e) - except xmlo.XmlError, e: + except xmlo.XmlError as e: raise NoteBookError("Notebook preference data is corrupt", e) diff --git a/keepnote/compat/notebook_v2.py b/keepnote/compat/notebook_v2.py index 9fa2c0933..f939647b9 100644 --- a/keepnote/compat/notebook_v2.py +++ b/keepnote/compat/notebook_v2.py @@ -5,25 +5,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports import os, sys, shutil, time, re, traceback, uuid @@ -35,7 +16,7 @@ from xml.sax.saxutils import escape -# keepnote imports +# keepnote.py imports import keepnote.compat.xmlobject_v3 as xmlo from keepnote.listening import Listeners from keepnote.timestamp import \ @@ -49,37 +30,37 @@ # NOTE: the header is left off to keep it compatiable with IE, # for the time being. # constants -BLANK_NOTE = u"""\ +BLANK_NOTE = """\ """ -XML_HEADER = u"""\ +XML_HEADER = """\ """ NOTEBOOK_FORMAT_VERSION = 2 ELEMENT_NODE = 1 -NODE_META_FILE = u"node.xml" -PAGE_DATA_FILE = u"page.html" -PLAIN_TEXT_DATA_FILE = u"page.txt" -PREF_FILE = u"notebook.nbk" -NOTEBOOK_META_DIR = u"__NOTEBOOK__" -NOTEBOOK_ICON_DIR = u"icons" -TRASH_DIR = u"__TRASH__" -TRASH_NAME = u"Trash" -DEFAULT_PAGE_NAME = u"New Page" -DEFAULT_DIR_NAME = u"New Folder" +NODE_META_FILE = "node.xml" +PAGE_DATA_FILE = "page.html" +PLAIN_TEXT_DATA_FILE = "page.txt" +PREF_FILE = "notebook.nbk" +NOTEBOOK_META_DIR = "__NOTEBOOK__" +NOTEBOOK_ICON_DIR = "icons" +TRASH_DIR = "__TRASH__" +TRASH_NAME = "Trash" +DEFAULT_PAGE_NAME = "New Page" +DEFAULT_DIR_NAME = "New Folder" DEFAULT_FONT_FAMILY = "Sans" DEFAULT_FONT_SIZE = 10 DEFAULT_FONT = "%s %d" % (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE) # content types -CONTENT_TYPE_PAGE = u"text/xhtml+xml" +CONTENT_TYPE_PAGE = "text/xhtml+xml" #CONTENT_TYPE_PLAIN_TEXT = "text/plain" -CONTENT_TYPE_TRASH = u"application/x-notebook-trash" -CONTENT_TYPE_DIR = u"application/x-notebook-dir" -CONTENT_TYPE_UNKNOWN = u"application/x-notebook-unknown" +CONTENT_TYPE_TRASH = "application/x-notebook-trash" +CONTENT_TYPE_DIR = "application/x-notebook-dir" +CONTENT_TYPE_UNKNOWN = "application/x-notebook-unknown" NULL = object() @@ -89,26 +70,26 @@ #============================================================================= # filename creation functions -REGEX_SLASHES = re.compile(ur"[/\\]") -REGEX_BAD_CHARS = re.compile(ur"[\?'&<>|`:;]") +REGEX_SLASHES = re.compile(r"[/\\]") +REGEX_BAD_CHARS = re.compile(r"[\?'&<>|`:;]") -def get_valid_filename(filename, default=u"folder"): +def get_valid_filename(filename, default="folder"): """Converts a filename into a valid one Strips bad characters from filename """ - filename = re.sub(REGEX_SLASHES, u"-", filename) - filename = re.sub(REGEX_BAD_CHARS, u"", filename) - filename = filename.replace(u"\t", " ") - filename = filename.strip(u" \t.") + filename = re.sub(REGEX_SLASHES, "-", filename) + filename = re.sub(REGEX_BAD_CHARS, "", filename) + filename = filename.replace("\t", " ") + filename = filename.strip(" \t.") # don't allow files to start with two underscores - if filename.startswith(u"__"): + if filename.startswith("__"): filename = filename[2:] # don't allow pure whitespace filenames - if filename == u"": + if filename == "": filename = default # use only lower case, some filesystems have trouble with mixed case @@ -117,7 +98,7 @@ def get_valid_filename(filename, default=u"folder"): return filename -def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, +def get_unique_filename(path, filename, ext="", sep=" ", number=2, return_number=False, use_number=False): """Returns a unique version of a filename for a given directory""" @@ -145,13 +126,13 @@ def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, i += 1 -def get_valid_unique_filename(path, filename, ext=u"", sep=u" ", number=2): +def get_valid_unique_filename(path, filename, ext="", sep=" ", number=2): """Returns a valid and unique version of a filename for a given path""" return get_unique_filename(path, get_valid_filename(filename), ext, sep, number) -def get_unique_filename_list(filenames, filename, ext=u"", sep=u" ", number=2): +def get_unique_filename_list(filenames, filename, ext="", sep=" ", number=2): """Returns a unique filename for a given list of existing files""" filenames = set(filenames) @@ -247,9 +228,9 @@ def get_notebook_version(filename): try: g_notebook_pref_parser.read(pref, filename) - except IOError, e: + except IOError as e: raise NoteBookError("Cannot read notebook preferences", e) - except xmlo.XmlError, e: + except xmlo.XmlError as e: raise NoteBookError("Notebook preference data is corrupt", e) return pref.version @@ -261,11 +242,11 @@ def new_nodeid(): #============================================================================= # classes -class NoteBookError (StandardError): +class NoteBookError (Exception): """Exception that occurs when manipulating NoteBook's""" def __init__(self, msg, error=None): - StandardError.__init__(self) + Exception.__init__(self) self.msg = msg self.error = error @@ -310,9 +291,9 @@ def __init__(self, name, datatype, key=None, write=None, read=None, # writer function if write is None: if datatype == bool: - self.write = lambda x: unicode(int(x)) + self.write = lambda x: str(int(x)) else: - self.write = unicode + self.write = str else: self.write = write @@ -356,13 +337,13 @@ def read_info_sort(key): #return _sort_info_backcompat.get(key, key) -title_attr = NoteBookAttr("Title", unicode, "title") +title_attr = NoteBookAttr("Title", str, "title") created_time_attr = NoteBookAttr("Created", int, "created_time", default=get_timestamp) modified_time_attr = NoteBookAttr("Modified", int, "modified_time", default=get_timestamp) g_default_attrs = [ title_attr, - NoteBookAttr("Content type", unicode, "content_type"), + NoteBookAttr("Content type", str, "content_type"), NoteBookAttr("Order", int, "order"), created_time_attr, modified_time_attr, @@ -371,8 +352,8 @@ def read_info_sort(key): NoteBookAttr("Folder Sort", str, "info_sort", read=read_info_sort), NoteBookAttr("Folder Sort Direction", int, "info_sort_dir"), NoteBookAttr("Node ID", str, "nodeid", default=new_nodeid), - NoteBookAttr("Icon", unicode, "icon"), - NoteBookAttr("Icon Open", unicode, "icon_open") + NoteBookAttr("Icon", str, "icon"), + NoteBookAttr("Icon Open", str, "icon_open") ] @@ -385,7 +366,7 @@ def read_info_sort(key): # TODO: parent might be an implict attr -# 1. attrs should be data that is optional (although keepnote has a few +# 1. attrs should be data that is optional (although keepnote.py has a few # required entries). # 2. attrs can appear in listview @@ -420,7 +401,7 @@ def create(self): try: os.mkdir(path) - except OSError, e: + except OSError as e: raise NoteBookError("Cannot create node", e) self._attr["created_time"] = get_timestamp() @@ -512,7 +493,7 @@ def clear_attr(self, title="", content_type=CONTENT_TYPE_DIR): self._attr = { "title": title, "content_type": content_type, - "order": sys.maxint, + "order": sys.maxsize, "created_time": None, "modified_time": None, "expanded": False, @@ -552,7 +533,7 @@ def del_attr(self, name): def iter_attr(self): """Iterate through attributes""" - return self._attr.iteritems() + return iter(self._attr.items()) def set_attr_timestamp(self, name, timestamp=None): @@ -597,7 +578,7 @@ def move(self, parent, index=None): try: os.rename(path, path2) - except OSError, e: + except OSError as e: raise NoteBookError("Do not have permission for move", e) self._set_basename(path2) @@ -629,7 +610,7 @@ def delete(self): path = self.get_path() try: shutil.rmtree(path) - except OSError, e: + except OSError as e: raise NoteBookError("Do not have permission to delete", e) self._parent._remove_child(self) @@ -702,7 +683,7 @@ def rename(self, title): self._attr["title"] = title self._set_basename(path2) self.save(True) - except (OSError, NoteBookError), e: + except (OSError, NoteBookError) as e: raise NoteBookError("Cannot rename '%s' to '%s'" % (path, path2), e) self.notify_change(False) @@ -737,7 +718,7 @@ def _get_children(self): try: files = os.listdir(path) - except OSError, e: + except OSError as e: raise NoteBookError("Do not have permission to read folder contents", e) for filename in files: @@ -748,8 +729,8 @@ def _get_children(self): if node: self._children.append(node) - except NoteBookError, e: - print >>sys.stderr, "error reading", path2 + except NoteBookError as e: + print("error reading", path2, file=sys.stderr) traceback.print_exception(*sys.exc_info()) continue # TODO: raise warning, not all children read @@ -868,7 +849,7 @@ def write_empty_data_file(self): out = safefile.open(datafile, "w", codec="utf-8") out.write(BLANK_NOTE) out.close() - except IOError, e: + except IOError as e: raise NoteBookError("Cannot initialize richtext file '%s'" % datafile, e) @@ -942,7 +923,7 @@ def write_empty_data_file(self): try: out = safefile.open(datafile, "w", codec="utf-8") out.close() - except IOError, e: + except IOError as e: raise NoteBookError("Cannot initialize richtext file '%s'" % datafile, e) @@ -998,10 +979,10 @@ def __init__(self): attr=("default_font", None, None)), xmlo.Tag("quick_pick_icons", tags=[ xmlo.TagMany("icon", - iterfunc=lambda s: range(len(s.quick_pick_icons)), - get=lambda (s,i),x: - s.quick_pick_icons.append(x), - set=lambda (s,i): s.quick_pick_icons[i]) + iterfunc=lambda s: list(range(len(s.quick_pick_icons))), + get=lambda s_i, x: + s_i.quick_pick_icons.append(x), + set=lambda s_i: s_i[0].quick_pick_icons[s_i[1]]) ]) ])) @@ -1097,7 +1078,7 @@ def create(self): def load(self, filename=None): """Load the NoteBook from the file-system""" if filename is not None: - filename = unicode(filename) + filename = str(filename) if os.path.isdir(filename): self._set_basename(filename) @@ -1187,7 +1168,7 @@ def _init_trash(self): self._trash = NoteBookTrash(TRASH_NAME, self) self._trash.create() self._add_child(self._trash) - except NoteBookError, e: + except NoteBookError as e: raise NoteBookError("Cannot create Trash folder", e) @@ -1313,9 +1294,9 @@ def write_preferences(self): os.mkdir(self.get_icon_dir()) g_notebook_pref_parser.write(self.pref, self.get_pref_file()) - except (IOError, OSError), e: + except (IOError, OSError) as e: raise NoteBookError("Cannot save notebook preferences", e) - except xmlo.XmlError, e: + except xmlo.XmlError as e: raise NoteBookError("File format error", e) @@ -1323,9 +1304,9 @@ def read_preferences(self): """Reads the NoteBook's preferneces from the file-system""" try: g_notebook_pref_parser.read(self.pref, self.get_pref_file()) - except IOError, e: + except IOError as e: raise NoteBookError("Cannot read notebook preferences", e) - except xmlo.XmlError, e: + except xmlo.XmlError as e: raise NoteBookError("Notebook preference data is corrupt", e) if self.pref.version > NOTEBOOK_FORMAT_VERSION: @@ -1437,8 +1418,8 @@ def write(self, filename, node, notebook_attrs): out.write("\n") out.close() - except Exception, e: - print e + except Exception as e: + print(e) raise NoteBookError("Cannot write meta data", e) @@ -1462,10 +1443,10 @@ def read(self, filename, notebook_attrs): self._parser.ParseFile(infile) infile.close() - except xml.parsers.expat.ExpatError, e: + except xml.parsers.expat.ExpatError as e: raise NoteBookError("Cannot read meta data", e) - except Exception, e: + except Exception as e: raise NoteBookError("Cannot read meta data", e) diff --git a/keepnote/compat/notebook_v3.py b/keepnote/compat/notebook_v3.py index 4ddb5c1f4..a70c619f4 100644 --- a/keepnote/compat/notebook_v3.py +++ b/keepnote/compat/notebook_v3.py @@ -9,25 +9,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports import gettext @@ -37,8 +18,8 @@ import shutil import re import traceback -import urlparse -import urllib2 +import urllib.parse +import urllib.request, urllib.error, urllib.parse import uuid # xml imports @@ -46,7 +27,7 @@ import xml.etree.cElementTree as ElementTree -# keepnote imports +# keepnote.py imports import keepnote.compat.xmlobject_v3 as xmlo from keepnote.listening import Listeners from keepnote.timestamp import get_timestamp @@ -64,67 +45,67 @@ # NOTE: the header is left off to keep it compatiable with IE, # for the time being. # constants -BLANK_NOTE = u"""\ +BLANK_NOTE = """\ """ -XML_HEADER = u"""\ +XML_HEADER = """\ """ NOTEBOOK_FORMAT_VERSION = 4 ELEMENT_NODE = 1 -NODE_META_FILE = u"node.xml" -PAGE_DATA_FILE = u"page.html" -PLAIN_TEXT_DATA_FILE = u"page.txt" -PREF_FILE = u"notebook.nbk" -NOTEBOOK_META_DIR = u"__NOTEBOOK__" -NOTEBOOK_ICON_DIR = u"icons" -TRASH_DIR = u"__TRASH__" -TRASH_NAME = u"Trash" -DEFAULT_PAGE_NAME = u"New Page" -DEFAULT_DIR_NAME = u"New Folder" +NODE_META_FILE = "node.xml" +PAGE_DATA_FILE = "page.html" +PLAIN_TEXT_DATA_FILE = "page.txt" +PREF_FILE = "notebook.nbk" +NOTEBOOK_META_DIR = "__NOTEBOOK__" +NOTEBOOK_ICON_DIR = "icons" +TRASH_DIR = "__TRASH__" +TRASH_NAME = "Trash" +DEFAULT_PAGE_NAME = "New Page" +DEFAULT_DIR_NAME = "New Folder" DEFAULT_FONT_FAMILY = "Sans" DEFAULT_FONT_SIZE = 10 DEFAULT_FONT = "%s %d" % (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE) # content types -CONTENT_TYPE_PAGE = u"text/xhtml+xml" +CONTENT_TYPE_PAGE = "text/xhtml+xml" #CONTENT_TYPE_PLAIN_TEXT = "text/plain" -CONTENT_TYPE_TRASH = u"application/x-notebook-trash" -CONTENT_TYPE_DIR = u"application/x-notebook-dir" -CONTENT_TYPE_UNKNOWN = u"application/x-notebook-unknown" +CONTENT_TYPE_TRASH = "application/x-notebook-trash" +CONTENT_TYPE_DIR = "application/x-notebook-dir" +CONTENT_TYPE_UNKNOWN = "application/x-notebook-unknown" NULL = object() # the node id of the implied root of all nodes everywhere -UNIVERSAL_ROOT = u"b810760f-f246-4e42-aebb-50ce51c3d1ed" +UNIVERSAL_ROOT = "b810760f-f246-4e42-aebb-50ce51c3d1ed" #============================================================================= # filename creation functions -REGEX_SLASHES = re.compile(ur"[/\\]") -REGEX_BAD_CHARS = re.compile(ur"[\?'&<>|`:;]") -REGEX_LEADING_UNDERSCORE = re.compile(ur"^__+") +REGEX_SLASHES = re.compile(r"[/\\]") +REGEX_BAD_CHARS = re.compile(r"[\?'&<>|`:;]") +REGEX_LEADING_UNDERSCORE = re.compile(r"^__+") -def get_valid_filename(filename, default=u"folder"): +def get_valid_filename(filename, default="folder"): """Converts a filename into a valid one Strips bad characters from filename """ - filename = re.sub(REGEX_SLASHES, u"-", filename) - filename = re.sub(REGEX_BAD_CHARS, u"", filename) - filename = filename.replace(u"\t", " ") - filename = filename.strip(u" \t.") + filename = re.sub(REGEX_SLASHES, "-", filename) + filename = re.sub(REGEX_BAD_CHARS, "", filename) + filename = filename.replace("\t", " ") + filename = filename.strip(" \t.") # don't allow files to start with two underscores - filename = re.sub(REGEX_LEADING_UNDERSCORE, u"", filename) + filename = re.sub(REGEX_LEADING_UNDERSCORE, "", filename) # don't allow pure whitespace filenames - if filename == u"": + if filename == "": filename = default # use only lower case, some filesystems have trouble with mixed case @@ -133,11 +114,11 @@ def get_valid_filename(filename, default=u"folder"): return filename -def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, +def get_unique_filename(path, filename, ext="", sep=" ", number=2, return_number=False, use_number=False): """Returns a unique version of a filename for a given directory""" - if path != u"": + if path != "": assert os.path.exists(path), path # try the given filename @@ -152,7 +133,7 @@ def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, # try numbered suffixes i = number while True: - newname = os.path.join(path, filename + sep + unicode(i) + ext) + newname = os.path.join(path, filename + sep + str(i) + ext) if not os.path.exists(newname): if return_number: return (newname, i) @@ -161,13 +142,13 @@ def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, i += 1 -def get_valid_unique_filename(path, filename, ext=u"", sep=u" ", number=2): +def get_valid_unique_filename(path, filename, ext="", sep=" ", number=2): """Returns a valid and unique version of a filename for a given path""" return get_unique_filename(path, get_valid_filename(filename), ext, sep, number) -def get_unique_filename_list(filenames, filename, ext=u"", sep=u" ", number=2): +def get_unique_filename_list(filenames, filename, ext="", sep=" ", number=2): """Returns a unique filename for a given list of existing files""" filenames = set(filenames) @@ -179,7 +160,7 @@ def get_unique_filename_list(filenames, filename, ext=u"", sep=u" ", number=2): # try numbered suffixes i = number while True: - newname = filename + sep + unicode(i) + ext + newname = filename + sep + str(i) + ext if newname not in filenames: return newname i += 1 @@ -221,9 +202,9 @@ def get_trash_dir(nodepath): #============================================================================= # HTML functions -TAG_PATTERN = re.compile(u"<[^>]*>") +TAG_PATTERN = re.compile("<[^>]*>") def strip_tags(line): - return re.sub(TAG_PATTERN, u"", line) + return re.sub(TAG_PATTERN, "", line) def read_data_as_plain_text(infile): """Read a Note data file as plain text""" @@ -261,9 +242,9 @@ def get_notebook_version(filename): try: tree = ElementTree.ElementTree(file=filename) - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot read notebook preferences"), e) - except Exception, e: + except Exception as e: raise NoteBookError(_("Notebook preference data is corrupt"), e) return get_notebook_version_etree(tree) @@ -283,25 +264,25 @@ def get_notebook_version_etree(tree): return int(p.text) else: - raise NoteBookError(_("Notebook preference data is corrupt"), e) + raise NoteBookError(_("Notebook preference data is corrupt")) def new_nodeid(): """Generate a new node id""" - return unicode(uuid.uuid4()) + return str(uuid.uuid4()) -def get_node_url(nodeid, host=u""): +def get_node_url(nodeid, host=""): """Get URL for a nodeid""" - return u"nbk://%s/%s" % (host, nodeid) + return "nbk://%s/%s" % (host, nodeid) def is_node_url(url): - return re.match(u"nbk://[^/]*/.*", url) != None + return re.match("nbk://[^/]*/.*", url) != None def parse_node_url(url): - match = re.match(u"nbk://([^/]*)/(.*)", url) + match = re.match("nbk://([^/]*)/(.*)", url) if match: return match.groups() else: @@ -339,7 +320,7 @@ def attach_file(filename, node, index=None): return child - except Exception, e: + except Exception as e: # remove child keepnote.log_error(e) if child: @@ -351,11 +332,11 @@ def attach_file(filename, node, index=None): #============================================================================= # errors -class NoteBookError (StandardError): +class NoteBookError (Exception): """Exception that occurs when manipulating NoteBook's""" def __init__(self, msg, error=None): - StandardError.__init__(self) + Exception.__init__(self) self.msg = msg self.error = error @@ -404,9 +385,9 @@ def __init__(self, name, datatype, key=None, write=None, read=None, # writer function if write is None: if datatype == bool: - self.write = lambda x: unicode(int(x)) + self.write = lambda x: str(int(x)) else: - self.write = unicode + self.write = str else: self.write = write @@ -454,28 +435,28 @@ def read_info_sort(key): return _sort_info_backcompat.get(key, key) -title_attr = AttrDef("Title", unicode, "title") +title_attr = AttrDef("Title", str, "title") created_time_attr = AttrDef("Created", int, "created_time", default=get_timestamp) modified_time_attr = AttrDef("Modified", int, "modified_time", default=get_timestamp) g_default_attr_defs = [ title_attr, - AttrDef("Content type", unicode, "content_type", + AttrDef("Content type", str, "content_type", default=lambda: CONTENT_TYPE_DIR), - AttrDef("Order", int, "order", default=lambda: sys.maxint), + AttrDef("Order", int, "order", default=lambda: sys.maxsize), created_time_attr, modified_time_attr, AttrDef("Expaned", bool, "expanded", default=lambda: True), AttrDef("Expanded2", bool, "expanded2", default=lambda: True), - AttrDef("Folder Sort", unicode, "info_sort", read=read_info_sort, + AttrDef("Folder Sort", str, "info_sort", read=read_info_sort, default=lambda: "order"), AttrDef("Folder Sort Direction", int, "info_sort_dir", default=lambda: 1), - AttrDef("Node ID", unicode, "nodeid", default=new_nodeid), - AttrDef("Icon", unicode, "icon"), - AttrDef("Icon Open", unicode, "icon_open"), - AttrDef("Filename", unicode, "payload_filename"), - AttrDef("Duplicate of", unicode, "duplicate_of") + AttrDef("Node ID", str, "nodeid", default=new_nodeid), + AttrDef("Icon", str, "icon"), + AttrDef("Icon Open", str, "icon_open"), + AttrDef("Filename", str, "payload_filename"), + AttrDef("Duplicate of", str, "duplicate_of") ] @@ -488,7 +469,7 @@ def read_info_sort(key): # TODO: parent might be an implict attr -# 1. attrs should be data that is optional (although keepnote has a few +# 1. attrs should be data that is optional (although keepnote.py has a few # required entries). # 2. attrs can appear in listview @@ -501,7 +482,7 @@ def read_info_sort(key): class NoteBookNode (object): """A general base class for all nodes in a NoteBook""" - def __init__(self, path, title=u"", parent=None, notebook=None, + def __init__(self, path, title="", parent=None, notebook=None, content_type=CONTENT_TYPE_DIR): self._notebook = notebook self._parent = parent @@ -598,7 +579,7 @@ def clear_attr(self, title="", content_type=CONTENT_TYPE_DIR): self._attr = { "title": title, "content_type": content_type, - "order": sys.maxint, + "order": sys.maxsize, "created_time": None, "modified_time": None, "expanded": True, @@ -641,7 +622,7 @@ def del_attr(self, name): def iter_attr(self): """Iterate through attributes of the node""" - return self._attr.iteritems() + return iter(self._attr.items()) def set_attr_timestamp(self, name, timestamp=None): @@ -674,7 +655,7 @@ def create(self): try: os.mkdir(path) - except OSError, e: + except OSError as e: raise NoteBookError(_("Cannot create node"), e) self._attr["created_time"] = get_timestamp() @@ -693,7 +674,7 @@ def delete(self): path = self.get_path() try: shutil.rmtree(path) - except OSError, e: + except OSError as e: raise NoteBookError(_("Do not have permission to delete"), e) self._parent._remove_child(self) @@ -769,7 +750,7 @@ def move(self, parent, index=None): try: os.rename(path, path2) #self._notebook._index.add_node(self) - except OSError, e: + except OSError as e: raise NoteBookError(_("Do not have permission for move"), e) self._set_basename(path2) @@ -817,7 +798,7 @@ def rename(self, title): self._attr["title"] = title self._set_basename(path2) self.save(True) - except (OSError, NoteBookError), e: + except (OSError, NoteBookError) as e: raise NoteBookError(_("Cannot rename '%s' to '%s'" % (path, path2)), e) #self._notebook._index.add_node(self) @@ -931,7 +912,7 @@ def has_children(self): """Return True if node has children""" try: - self.iter_temp_children().next() + next(self.iter_temp_children()) return True except StopIteration: return False @@ -960,7 +941,7 @@ def iter_temp_children(self): try: files = os.listdir(path) - except OSError, e: + except OSError as e: raise NoteBookError(_("Do not have permission to read folder contents"), e) for filename in files: @@ -973,8 +954,8 @@ def iter_temp_children(self): if node: yield node - except NoteBookError, e: - print >>sys.stderr, "error reading", path2 + except NoteBookError as e: + print("error reading", path2, file=sys.stderr) traceback.print_exception(*sys.exc_info()) continue # TODO: raise warning, not all children read @@ -1077,7 +1058,7 @@ def write_empty_data_file(self): out = safefile.open(datafile, "w", codec="utf-8") out.write(BLANK_NOTE) out.close() - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot initialize richtext file '%s'" % datafile), e) @@ -1183,7 +1164,7 @@ def write_empty_data_file(self): try: out = safefile.open(datafile, "w", codec="utf-8") out.close() - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot initialize richtext file '%s'" % datafile), e) @@ -1233,7 +1214,7 @@ def set_payload(self, filename, new_filename=None): try: # attempt url parse - parts = urlparse.urlparse(filename) + parts = urllib.parse.urlparse(filename) if os.path.exists(filename) or parts[0] == "": # perform local copy @@ -1241,7 +1222,7 @@ def set_payload(self, filename, new_filename=None): else: # perform download out = open(new_filename, "w") - infile = urllib2.urlopen(filename) + infile = urllib.request.urlopen(filename) while True: data = infile.read(1024*4) if data == "": @@ -1249,7 +1230,7 @@ def set_payload(self, filename, new_filename=None): out.write(data) infile.close() out.close() - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot copy file '%s'" % filename), e) # set attr @@ -1297,7 +1278,7 @@ def set_data(self, data): self.version = data.get("version", NOTEBOOK_FORMAT_VERSION) self.default_font = data.get("default_font", DEFAULT_FONT) - self.index_dir = data.get("index_dir", u"") + self.index_dir = data.get("index_dir", "") self.selected_treeview_nodes = data.get("selected_treeview_nodes", []) self.selected_listview_nodes = data.get("selected_listview_nodes", []) @@ -1325,7 +1306,7 @@ def clear(self): self.version = NOTEBOOK_FORMAT_VERSION self.default_font = DEFAULT_FONT - self.index_dir = u"" + self.index_dir = "" self.selected_treeview_nodes = [] self.selected_listview_nodes = [] @@ -1348,16 +1329,16 @@ def write_new_preferences(pref, filename): data = pref.get_data() out = safefile.open(filename, "w", codec="utf-8") - out.write(u'\n' - u'\n' - u'%d\n' - u'\n' % data["version"]) + out.write('\n' + '\n' + '%d\n' + '\n' % data["version"]) plist.dump(data, out, indent=4, depth=4) - out.write(u'\n' - u'\n') + out.write('\n' + '\n') out.close() - except (IOError, OSError), e: + except (IOError, OSError) as e: raise NoteBookError(_("Cannot save notebook preferences"), e) @@ -1389,10 +1370,10 @@ def write_new_preferences(pref, filename): xmlo.Tag("quick_pick_icons", tags=[ xmlo.TagMany("icon", - iterfunc=lambda s: range(len(s._quick_pick_icons)), + iterfunc=lambda s: list(range(len(s._quick_pick_icons))), get=lambda (s,i),x: s._quick_pick_icons.append(x), - set=lambda (s,i): s._quick_pick_icons[i]) + set=lambda s_i: s_i[0]._quick_pick_icons[s_i[1]]) ]), ])) @@ -1641,7 +1622,7 @@ def _init_trash(self): self._trash = NoteBookTrash(TRASH_NAME, self) self._trash.create() self._add_child(self._trash) - except NoteBookError, e: + except NoteBookError as e: raise NoteBookError(_("Cannot create Trash folder"), e) @@ -1826,9 +1807,9 @@ def write_preferences(self): os.mkdir(self.get_icon_dir()) g_notebook_pref_parser.write(self.pref, self.get_pref_file()) - except (IOError, OSError), e: + except (IOError, OSError) as e: raise NoteBookError(_("Cannot save notebook preferences"), e) - except xmlo.XmlError, e: + except xmlo.XmlError as e: raise NoteBookError(_("File format error"), e) @@ -1836,9 +1817,9 @@ def read_preferences(self): """Reads the NoteBook's preferneces from the file-system""" try: tree = ElementTree.ElementTree(file=self.get_pref_file()) - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot read notebook preferences"), e) - except Exception, e: + except Exception as e: raise NoteBookError(_("Notebook preference data is corrupt"), e) @@ -1907,7 +1888,7 @@ def read_node(self, notebook, parent, path): try: attr = self.read_meta_data(metafile, notebook.attr_defs) - except IOError, e: + except IOError as e: # ignore directory, not a NoteBook directory return None @@ -1974,7 +1955,7 @@ def write_meta_data(self, filename, node, attr_defs): out.write("\n") out.close() - except Exception, e: + except Exception as e: raise NoteBookError(_("Cannot write meta data"), e) @@ -1986,7 +1967,7 @@ def read_meta_data(self, filename, attr_defs): try: tree = ElementTree.ElementTree(file=filename) - except Exception, e: + except Exception as e: raise NoteBookError(_("Error reading meta data file"), e) # check root diff --git a/keepnote/compat/notebook_v4.py b/keepnote/compat/notebook_v4.py index bb83a85bb..96bdb6a09 100644 --- a/keepnote/compat/notebook_v4.py +++ b/keepnote/compat/notebook_v4.py @@ -5,26 +5,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - # python imports import mimetypes import os @@ -32,8 +12,8 @@ import shutil import re import traceback -import urlparse -import urllib2 +import urllib.parse +import urllib.request, urllib.error, urllib.parse import uuid # xml imports @@ -41,7 +21,7 @@ import xml.etree.cElementTree as ET -# keepnote imports +# keepnote.py imports from keepnote.listening import Listeners from keepnote.timestamp import get_timestamp from keepnote import trans @@ -64,7 +44,7 @@ # NOTE: the header is left off to keep it compatiable with IE, # for the time being. # constants -BLANK_NOTE = u"""\ +BLANK_NOTE = """\ """ @@ -72,36 +52,36 @@ NOTEBOOK_FORMAT_VERSION = 5 ELEMENT_NODE = 1 -PAGE_DATA_FILE = u"page.html" -PREF_FILE = u"notebook.nbk" -NOTEBOOK_META_DIR = u"__NOTEBOOK__" -NOTEBOOK_ICON_DIR = u"icons" -TRASH_DIR = u"__TRASH__" -TRASH_NAME = u"Trash" -DEFAULT_PAGE_NAME = u"New Page" -DEFAULT_DIR_NAME = u"New Folder" +PAGE_DATA_FILE = "page.html" +PREF_FILE = "notebook.nbk" +NOTEBOOK_META_DIR = "__NOTEBOOK__" +NOTEBOOK_ICON_DIR = "icons" +TRASH_DIR = "__TRASH__" +TRASH_NAME = "Trash" +DEFAULT_PAGE_NAME = "New Page" +DEFAULT_DIR_NAME = "New Folder" # content types -CONTENT_TYPE_PAGE = u"text/xhtml+xml" +CONTENT_TYPE_PAGE = "text/xhtml+xml" #CONTENT_TYPE_PLAIN_TEXT = "text/plain" -CONTENT_TYPE_TRASH = u"application/x-notebook-trash" -CONTENT_TYPE_DIR = u"application/x-notebook-dir" -CONTENT_TYPE_UNKNOWN = u"application/x-notebook-unknown" +CONTENT_TYPE_TRASH = "application/x-notebook-trash" +CONTENT_TYPE_DIR = "application/x-notebook-dir" +CONTENT_TYPE_UNKNOWN = "application/x-notebook-unknown" NULL = object() # the node id of the implied root of all nodes everywhere -UNIVERSAL_ROOT = u"b810760f-f246-4e42-aebb-50ce51c3d1ed" +UNIVERSAL_ROOT = "b810760f-f246-4e42-aebb-50ce51c3d1ed" #============================================================================= # common filesystem functions -def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, +def get_unique_filename(path, filename, ext="", sep=" ", number=2, return_number=False, use_number=False): """Returns a unique version of a filename for a given directory""" - if path != u"": + if path != "": assert os.path.exists(path), path # try the given filename @@ -116,7 +96,7 @@ def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, # try numbered suffixes i = number while True: - newname = os.path.join(path, filename + sep + unicode(i) + ext) + newname = os.path.join(path, filename + sep + str(i) + ext) if not os.path.exists(newname): if return_number: return (newname, i) @@ -125,7 +105,7 @@ def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, i += 1 -def get_unique_filename_list(filenames, filename, ext=u"", sep=u" ", number=2): +def get_unique_filename_list(filenames, filename, ext="", sep=" ", number=2): """Returns a unique filename for a given list of existing files""" filenames = set(filenames) @@ -137,12 +117,16 @@ def get_unique_filename_list(filenames, filename, ext=u"", sep=u" ", number=2): # try numbered suffixes i = number while True: - newname = filename + sep + unicode(i) + ext + newname = filename + sep + str(i) + ext if newname not in filenames: return newname i += 1 +class Excpetion: + pass + + def relpath(filename, start): """ Returns the relative filename to start @@ -202,9 +186,9 @@ def normalize_notebook_dirname(filename, longpath=None): #============================================================================= # HTML functions -TAG_PATTERN = re.compile(u"<[^>]*>") +TAG_PATTERN = re.compile("<[^>]*>") def strip_tags(line): - return re.sub(TAG_PATTERN, u"", line) + return re.sub(TAG_PATTERN, "", line) def read_data_as_plain_text(infile): """Read a Note data file as plain text""" @@ -244,9 +228,9 @@ def get_notebook_version(filename): try: tree = ET.ElementTree(file=filename) - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot read notebook preferences"), e) - except Exception, e: + except Exception as e: raise NoteBookError(_("Notebook preference data is corrupt"), e) return get_notebook_version_etree(tree) @@ -267,23 +251,23 @@ def get_notebook_version_etree(tree): return int(p.text) else: - raise NoteBookError(_("Notebook preference data is corrupt"), e) + raise NoteBookError(_("Notebook preference data is corrupt")) def new_nodeid(): """Generate a new node id""" - return unicode(uuid.uuid4()) + return str(uuid.uuid4()) -def get_node_url(nodeid, host=u""): +def get_node_url(nodeid, host=""): """Get URL for a nodeid""" - return u"nbk://%s/%s" % (host, nodeid) + return "nbk://%s/%s" % (host, nodeid) def is_node_url(url): """Returns True if URL is a node""" - return re.match(u"nbk://[^/]*/.*", url) != None + return re.match("nbk://[^/]*/.*", url) != None def parse_node_url(url): """ @@ -292,7 +276,7 @@ def parse_node_url(url): nbk:///abcd => ("", "abcd") nbk://example.com/abcd => ("example.com", "abcd") """ - match = re.match(u"nbk://([^/]*)/(.*)", url) + match = re.match("nbk://([^/]*)/(.*)", url) if match: return match.groups() else: @@ -335,7 +319,7 @@ def attach_file(filename, node, index=None): child.save(True) return child - except Exception, e: + except Exception as e: # remove child keepnote.log_error(e) if child: @@ -358,11 +342,11 @@ def new_page(parent, title=None, index=None): #============================================================================= # errors -class NoteBookError (StandardError): +class NoteBookError (Exception): """Exception that occurs when manipulating NoteBook's""" def __init__(self, msg, error=None): - StandardError.__init__(self) + Exception.__init__(self) self.msg = msg self.error = error @@ -411,9 +395,9 @@ def __init__(self, key, datatype, name, default=None): # writer function if datatype == bool: - self.write = lambda x: unicode(int(x)) + self.write = lambda x: str(int(x)) else: - self.write = unicode + self.write = str # reader function if datatype == bool: @@ -431,21 +415,21 @@ def __init__(self, value): g_default_attr_defs = [ - AttrDef("nodeid", unicode, "Node ID", default=new_nodeid), - AttrDef("content_type", unicode, "Content type", + AttrDef("nodeid", str, "Node ID", default=new_nodeid), + AttrDef("content_type", str, "Content type", default=lambda: CONTENT_TYPE_DIR), - AttrDef("title", unicode, "Title"), - AttrDef("order", int, "Order", default=lambda: sys.maxint), + AttrDef("title", str, "Title"), + AttrDef("order", int, "Order", default=lambda: sys.maxsize), AttrDef("created_time", int, "Created time", default=get_timestamp), AttrDef("modified_time", int, "Modified time", default=get_timestamp), AttrDef("expanded", bool, "Expaned", default=lambda: True), AttrDef("expanded2", bool, "Expanded2", default=lambda: True), - AttrDef("info_sort", unicode, "Folder sort", default=lambda: "order"), + AttrDef("info_sort", str, "Folder sort", default=lambda: "order"), AttrDef("info_sort_dir", int, "Folder sort direction", default=lambda: 1), - AttrDef("icon", unicode, "Icon"), - AttrDef("icon_open", unicode, "Icon open"), - AttrDef("payload_filename", unicode, "Filename"), - AttrDef("duplicate_of", unicode, "Duplicate of") + AttrDef("icon", str, "Icon"), + AttrDef("icon_open", str, "Icon open"), + AttrDef("payload_filename", str, "Filename"), + AttrDef("duplicate_of", str, "Duplicate of") ] @@ -467,7 +451,7 @@ def __init__(self, name, attrs=[]): # TODO: parent might be an implict attr -# 1. attrs should be data that is optional (although keepnote has a few +# 1. attrs should be data that is optional (although keepnote.py has a few # required entries). # 2. attrs can appear in listview @@ -480,7 +464,7 @@ def __init__(self, name, attrs=[]): class NoteBookNode (object): """A general base class for all nodes in a NoteBook""" - def __init__(self, title=u"", parent=None, notebook=None, + def __init__(self, title="", parent=None, notebook=None, content_type=CONTENT_TYPE_DIR, conn=None, init_attr=True): self._notebook = notebook @@ -579,7 +563,7 @@ def del_attr(self, name): def iter_attr(self): """Iterate through attributes of the node""" - return self._attr.iteritems() + return iter(self._attr.items()) def _init_attr(self, attr): @@ -621,7 +605,7 @@ def set_payload(self, filename, new_filename=None): try: # attempt url parse - parts = urlparse.urlparse(filename) + parts = urllib.parse.urlparse(filename) if os.path.exists(filename) or parts[0] == "": # perform local copy @@ -630,7 +614,7 @@ def set_payload(self, filename, new_filename=None): else: # perform download out = self.open_file(new_filename, "wb") - infile = urllib2.urlopen(filename) + infile = urllib.request.urlopen(filename) while True: data = infile.read(1024*4) if data == "": @@ -638,7 +622,7 @@ def set_payload(self, filename, new_filename=None): out.write(data) infile.close() out.close() - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot copy file '%s'" % filename), e) # set attr @@ -834,7 +818,7 @@ def rename(self, title): try: self._attr["title"] = title self.save(True) - except NoteBookError, e: + except NoteBookError as e: self._attr["title"] = oldtitle raise @@ -956,7 +940,7 @@ def _get_children(self): self._children = list(self._iter_children()) # assign orders - self._children.sort(key=lambda x: x._attr.get("order", sys.maxint)) + self._children.sort(key=lambda x: x._attr.get("order", sys.maxsize)) self._set_child_order() @@ -1040,7 +1024,7 @@ def open_file(self, filename, mode="r", codec="utf-8"): def delete_file(self, filename): return self._conn.delete_file(self._attr["nodeid"], filename) - def new_filename(self, new_filename, ext=u"", sep=u" ", number=2, + def new_filename(self, new_filename, ext="", sep=" ", number=2, return_number=False, use_number=False, ensure_valid=True): return self._conn.new_filename( self._attr["nodeid"], new_filename, ext, sep, number, @@ -1295,7 +1279,7 @@ def load(self, filename=None): recover=False) # TODO: temp solution. remove soon. - index_dir = self.pref.get("index_dir", default=u"") + index_dir = self.pref.get("index_dir", default="") if index_dir and os.path.exists(index_dir): self._conn._set_index_file( os.path.join(index_dir, notebook_index.INDEX_FILE)) @@ -1320,7 +1304,7 @@ def load(self, filename=None): def save(self, force=False): """Recursively save any loaded nodes""" - # TODO: keepnote copy of old pref. only save pref if its changed. + # TODO: keepnote.py copy of old pref. only save pref if its changed. if force or self in self._dirty: self._conn.update_node(self._attr["nodeid"], self._attr) @@ -1459,7 +1443,7 @@ def _init_trash(self): {"title": TRASH_NAME}) self._add_child(self._trash) - except NoteBookError, e: + except NoteBookError as e: raise NoteBookError(_("Cannot create Trash folder"), e) @@ -1516,7 +1500,7 @@ def install_icon(self, filename): basename) newfilename = self._conn.new_filename(self._attr["nodeid"], - newfilename, ext, u"-", + newfilename, ext, "-", ensure_valid=False) self._conn.copy_node_file(None, filename, @@ -1541,7 +1525,7 @@ def install_icons(self, filename, filename_open): use_number = False while True: newfilename, number = self._conn.new_filename( - self._attr["nodeid"], startname, ext, u"-", + self._attr["nodeid"], startname, ext, "-", number=number, return_number=True, use_number=use_number, ensure_valid=False, path=nodepath) @@ -1549,10 +1533,10 @@ def install_icons(self, filename, filename_open): # determine open icon filename newfilename_open = startname if number: - newfilename_open += u"-" + unicode(number) + newfilename_open += "-" + str(number) else: number = 2 - newfilename_open += u"-open" + ext + newfilename_open += "-open" + ext # see if it already exists if self._conn.file_exists(self._attr["nodeid"], newfilename_open): @@ -1682,18 +1666,18 @@ def write_preferences(self): data = self.pref.get_data() out = self.open_file(PREF_FILE, "w", codec="utf-8") - out.write(u'\n' - u'\n' - u'%d\n' - u'\n' % data["version"]) + out.write('\n' + '\n' + '%d\n' + '\n' % data["version"]) plist.dump(data, out, indent=4, depth=4) - out.write(u'\n' - u'\n') + out.write('\n' + '\n') out.close() - except (IOError, OSError), e: + except (IOError, OSError) as e: raise NoteBookError(_("Cannot save notebook preferences"), e) - except Exception, e: + except Exception as e: raise NoteBookError(_("File format error"), e) @@ -1705,10 +1689,10 @@ def read_preferences(self, infile=None, recover=True): infile = self.open_file(PREF_FILE, "r", codec="utf-8") root = ET.fromstring(infile.read()) tree = ET.ElementTree(root) - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot read notebook preferences %s") % self.get_file(PREF_FILE) , e) - except Exception, e: + except Exception as e: if recover: if infile: infile.close() diff --git a/keepnote/compat/pref.py b/keepnote/compat/pref.py index cc3938eea..6998d6d39 100644 --- a/keepnote/compat/pref.py +++ b/keepnote/compat/pref.py @@ -1,29 +1,8 @@ """ - KeepNote - Backward compatiability for configuration information - + Backward compatibility for configuration information """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - import os import shutil from xml.etree import ElementTree @@ -33,28 +12,25 @@ from keepnote import xdg import keepnote.timestamp import keepnote.compat.xmlobject_v3 as xmlo -from keepnote.util import compose +from keepnote.util.platform import compose from keepnote import orderdict +OLD_USER_PREF_DIR = "takenote" +OLD_USER_PREF_FILE = "takenote.xml" +OLD_XDG_USER_EXTENSIONS_DIR = "takenote/extensions" +OLD_XDG_USER_EXTENSIONS_DATA_DIR = "takenote/extensions_data" -OLD_USER_PREF_DIR = u"takenote" -OLD_USER_PREF_FILE = u"takenote.xml" -OLD_XDG_USER_EXTENSIONS_DIR = u"takenote/extensions" -OLD_XDG_USER_EXTENSIONS_DATA_DIR = u"takenote/extensions_data" - - -USER_PREF_DIR = u"keepnote" -USER_PREF_FILE = u"keepnote.xml" -USER_EXTENSIONS_DIR = u"extensions" -USER_EXTENSIONS_DATA_DIR = u"extensions_data" +USER_PREF_DIR = "keepnote.py" +USER_PREF_FILE = "keepnote.py.xml" +USER_EXTENSIONS_DIR = "extensions" +USER_EXTENSIONS_DATA_DIR = "extensions_data" -XDG_USER_EXTENSIONS_DIR = u"keepnote/extensions" -XDG_USER_EXTENSIONS_DATA_DIR = u"keepnote/extensions_data" +XDG_USER_EXTENSIONS_DIR = "keepnote.py/extensions" +XDG_USER_EXTENSIONS_DATA_DIR = "keepnote.py/extensions_data" -#============================================================================= -# preference directory compatibility - +# ============================================================================= +# Preference directory compatibility def get_old_pref_dir1(home): """ @@ -72,29 +48,27 @@ def get_old_pref_dir2(home): return os.path.join(home, ".config", OLD_USER_PREF_DIR) - def get_new_pref_dir(home): """ - Returns old preference directory (type 2) - $HOME/.config/takenote + Returns new preference directory + $HOME/.config/keepnote.py """ return os.path.join(home, ".config", USER_PREF_DIR) def get_home(): """Return HOME directory""" - home = keepnote.ensure_unicode(os.getenv(u"HOME"), FS_ENCODING) + home = keepnote.ensure_unicode(os.getenv("HOME"), FS_ENCODING) if home is None: - raise EnvError("HOME environment variable must be specified") + raise keepnote.EnvError("HOME environment variable must be specified") return home def get_old_user_pref_dir(home=None): - """Returns the directory of the application preference file""" - + """Returns the directory of the old application preference file""" + p = keepnote.get_platform() - if p == "unix" or p == "darwin": - + if p in ("unix", "darwin"): if home is None: home = get_home() old_dir = get_old_pref_dir1(home) @@ -111,15 +85,14 @@ def get_old_user_pref_dir(home=None): return os.path.join(appdata, OLD_USER_PREF_DIR) else: - raise Exception("unknown platform '%s'" % p) + raise Exception(f"unknown platform '{p}'") def get_new_user_pref_dir(home=None): - """Returns the directory of the application preference file""" - + """Returns the directory of the new application preference file""" + p = keepnote.get_platform() - if p == "unix" or p == "darwin": - + if p in ("unix", "darwin"): if home is None: home = get_home() return xdg.get_config_file(USER_PREF_DIR, default=True) @@ -131,111 +104,102 @@ def get_new_user_pref_dir(home=None): return os.path.join(appdata, USER_PREF_DIR) else: - raise Exception("unknown platform '%s'" % p) + raise Exception(f"unknown platform '{p}'") def upgrade_user_pref_dir(old_user_pref_dir, new_user_pref_dir): """Moves preference data from old location to new one""" - - import sys - - # move user preference directory + # Move user preference directory shutil.copytree(old_user_pref_dir, new_user_pref_dir) - # rename takenote.xml to keepnote.xml + # Rename takenote.xml to keepnote.py.xml oldfile = os.path.join(new_user_pref_dir, OLD_USER_PREF_FILE) newfile = os.path.join(new_user_pref_dir, USER_PREF_FILE) if os.path.exists(oldfile): os.rename(oldfile, newfile) - - # rename root xml tag + + # Rename root XML tag tree = ElementTree.ElementTree(file=newfile) elm = tree.getroot() - elm.tag = "keepnote" + elm.tag = "keepnote.py" tree.write(newfile, encoding="UTF-8") - # move over data files from .local/share/takenote + # Move over data files from .local/share/takenote if keepnote.get_platform() in ("unix", "darwin"): datadir = os.path.join(get_home(), ".local", "share", "takenote") - + old_ext_dir = os.path.join(datadir, "extensions") - new_ext_dir = os.path.join(new_user_pref_dir, "extensions") + new_ext_dir = os.path.join(new_user_pref_dir, "extensions") if not os.path.exists(new_ext_dir) and os.path.exists(old_ext_dir): shutil.copytree(old_ext_dir, new_ext_dir) old_ext_dir = os.path.join(datadir, "extensions_data") - new_ext_dir = os.path.join(new_user_pref_dir, "extensions_data") + new_ext_dir = os.path.join(new_user_pref_dir, "extensions_data") if not os.path.exists(new_ext_dir) and os.path.exists(old_ext_dir): shutil.copytree(old_ext_dir, new_ext_dir) - - def check_old_user_pref_dir(home=None): """Upgrades user preference directory if it exists in an old format""" - old_pref_dir = get_old_user_pref_dir(home) new_pref_dir = get_new_user_pref_dir(home) if not os.path.exists(new_pref_dir) and os.path.exists(old_pref_dir): upgrade_user_pref_dir(old_pref_dir, new_pref_dir) - -#============================================================================= +# ============================================================================= # XML config compatibility - - DEFAULT_WINDOW_SIZE = (1024, 600) DEFAULT_WINDOW_POS = (-1, -1) DEFAULT_VSASH_POS = 200 DEFAULT_HSASH_POS = 200 DEFAULT_VIEW_MODE = "vertical" -DEFAULT_AUTOSAVE_TIME = 10 * 1000 # 10 sec (in msec) +DEFAULT_AUTOSAVE_TIME = 10 * 1000 # 10 sec (in msec) + -class ExternalApp (object): +class ExternalApp: """Class represents the information needed for calling an external application""" - def __init__(self, key, title, prog, args=[]): + def __init__(self, key, title, prog, args=None): self.key = key self.title = title self.prog = prog - self.args = args + self.args = args if args is not None else [] -class KeepNotePreferences (object): +class KeepNotePreferences: """Preference data structure for the KeepNote application""" - - def __init__(self): - # external apps + def __init__(self): + # External apps self.external_apps = [] self._external_apps = [] self._external_apps_lookup = {} self.id = "" - # extensions + # Extensions self.disabled_extensions = [] - # window presentation options + # Window presentation options self.window_size = DEFAULT_WINDOW_SIZE self.window_maximized = True self.vsash_pos = DEFAULT_VSASH_POS self.hsash_pos = DEFAULT_HSASH_POS self.view_mode = DEFAULT_VIEW_MODE - - # look and feel + + # Look and feel self.treeview_lines = True self.listview_rules = True self.use_stock_icons = False self.use_minitoolbar = False - # autosave + # Autosave self.autosave = True self.autosave_time = DEFAULT_AUTOSAVE_TIME - + self.default_notebook = "" self.use_last_notebook = True self.timestamp_formats = dict(keepnote.timestamp.DEFAULT_TIMESTAMP_FORMATS) @@ -248,117 +212,111 @@ def __init__(self): self.language = "" - # dialog chooser paths + # Dialog chooser paths docs = "" self.new_notebook_path = docs self.archive_notebook_path = docs self.insert_image_path = docs self.save_image_path = docs self.attach_file_path = docs - - - # temp variables for parsing + # Temp variables for parsing self._last_timestamp_name = "" self._last_timestamp_format = "" - - def _get_data(self, data=None): - if data is None: data = orderdict.OrderDict() - data["id"] = self.id - # language + # Language data["language"] = self.language - # window presentation options - data["window"] = {"window_size": self.window_size, - "window_maximized": self.window_maximized, - "use_systray": self.use_systray, - "skip_taskbar": self.skip_taskbar - } + # Window presentation options + data["window"] = { + "window_size": self.window_size, + "window_maximized": self.window_maximized, + "use_systray": self.use_systray, + "skip_taskbar": self.skip_taskbar + } - # autosave + # Autosave data["autosave"] = self.autosave data["autosave_time"] = self.autosave_time - + data["default_notebook"] = self.default_notebook data["use_last_notebook"] = self.use_last_notebook data["recent_notebooks"] = self.recent_notebooks data["timestamp_formats"] = self.timestamp_formats - # editor + # Editor data["editors"] = { "general": { "spell_check": self.spell_check, "image_size_snap": self.image_size_snap, "image_size_snap_amount": self.image_size_snap_amount - } } - + } - # viewer + # Viewer data["viewers"] = { "three_pane_viewer": { "vsash_pos": self.vsash_pos, "hsash_pos": self.hsash_pos, "view_mode": self.view_mode - } } - - # look and feel + } + + # Look and feel data["look_and_feel"] = { "treeview_lines": self.treeview_lines, "listview_rules": self.listview_rules, "use_stock_icons": self.use_stock_icons, "use_minitoolbar": self.use_minitoolbar - } + } - # dialog chooser paths + # Dialog chooser paths data["default_paths"] = { "new_notebook_path": self.new_notebook_path, "archive_notebook_path": self.archive_notebook_path, "insert_image_path": self.insert_image_path, "save_image_path": self.save_image_path, "attach_file_path": self.attach_file_path - } + } - # external apps + # External apps data["external_apps"] = [ - {"key": app.key, - "title": app.title, - "prog": app.prog, - "args": app.args} - for app in self.external_apps] + { + "key": app.key, + "title": app.title, + "prog": app.prog, + "args": app.args + } + for app in self.external_apps + ] - # extensions + # Extensions data["extension_info"] = { "disabled": self.disabled_extensions - } + } data["extensions"] = {} - return data - def read(self, filename): """Read preferences from file""" - - # clear external apps vars + # Clear external apps vars self.external_apps = [] self._external_apps_lookup = {} - # read xml preference file - g_keepnote_pref_parser.read(self, filename) + # Read XML preference file + with open(filename, "rb") as infile: + g_keepnote_pref_parser.read(self, infile) - g_keepnote_pref_parser = xmlo.XmlObject( - xmlo.Tag("keepnote", tags=[ + xmlo.Tag("keepnote.py", tags=[ xmlo.Tag("id", attr=("id", None, None)), xmlo.Tag("language", attr=("language", None, None)), @@ -367,7 +325,7 @@ def read(self, filename): xmlo.Tag("use_last_notebook", attr=("use_last_notebook", xmlo.str2bool, xmlo.bool2str)), - # window presentation options + # Window presentation options xmlo.Tag("view_mode", attr=("view_mode", None, None)), xmlo.Tag("window_size", @@ -375,13 +333,12 @@ def read(self, filename): lambda x: tuple(map(int, x.split(","))), lambda x: "%d,%d" % x)), xmlo.Tag("window_maximized", - attr=("window_maximized", xmlo.str2bool, xmlo.bool2str)), + attr=("window_maximized", xmlo.str2bool, xmlo.bool2str)), xmlo.Tag("vsash_pos", attr=("vsash_pos", int, compose(str, int))), xmlo.Tag("hsash_pos", attr=("hsash_pos", int, compose(str, int))), - xmlo.Tag("treeview_lines", attr=("treeview_lines", xmlo.str2bool, xmlo.bool2str)), xmlo.Tag("listview_rules", @@ -391,8 +348,7 @@ def read(self, filename): xmlo.Tag("use_minitoolbar", attr=("use_minitoolbar", xmlo.str2bool, xmlo.bool2str)), - - # image resize + # Image resize xmlo.Tag("image_size_snap", attr=("image_size_snap", xmlo.str2bool, xmlo.bool2str)), xmlo.Tag("image_size_snap_amount", @@ -402,8 +358,8 @@ def read(self, filename): attr=("use_systray", xmlo.str2bool, xmlo.bool2str)), xmlo.Tag("skip_taskbar", attr=("skip_taskbar", xmlo.str2bool, xmlo.bool2str)), - - # misc options + + # Misc options xmlo.Tag("spell_check", attr=("spell_check", xmlo.str2bool, xmlo.bool2str)), @@ -411,10 +367,10 @@ def read(self, filename): attr=("autosave", xmlo.str2bool, xmlo.bool2str)), xmlo.Tag("autosave_time", attr=("autosave_time", int, compose(str, int))), - - # default paths + + # Default paths xmlo.Tag("new_notebook_path", - attr=("new_notebook_path", None, None)), + attr=("new_notebook_path", None, None)), xmlo.Tag("archive_notebook_path", attr=("archive_notebook_path", None, None)), xmlo.Tag("insert_image_path", @@ -423,70 +379,56 @@ def read(self, filename): attr=("save_image_path", None, None)), xmlo.Tag("attach_file_path", attr=("attach_file_path", None, None)), - - # recent notebooks + # Recent notebooks xmlo.Tag("recent_notebooks", tags=[ - xmlo.TagMany("notebook", - iterfunc=lambda s: range(len(s.recent_notebooks)), - get=lambda (s, i), x: s.recent_notebooks.append(x), - set=lambda (s, i): s.recent_notebooks[i] - ) - ]), - - # disabled extensions + xmlo.TagMany("notebook", + iterfunc=lambda s: list(range(len(s.recent_notebooks))), + get=lambda s_i, x: s_i[0].recent_notebooks.append(x), + set=lambda s_i: s_i[0].recent_notebooks[s_i[1]]) + ]), + + # Disabled extensions xmlo.Tag("extensions", tags=[ xmlo.Tag("disabled", tags=[ xmlo.TagMany("extension", - iterfunc=lambda s: range(len(s.disabled_extensions)), - get=lambda (s, i), x: s.disabled_extensions.append(x), - set=lambda (s, i): s.disabled_extensions[i] - ) - ]), + iterfunc=lambda s: list(range(len(s.disabled_extensions))), + get=lambda s_i, x: s_i[0].disabled_extensions.append(x), + set=lambda s_i: s_i[0].disabled_extensions[s_i[1]]) ]), - + ]), xmlo.Tag("external_apps", tags=[ + xmlo.TagMany("app", + iterfunc=lambda s: list(range(len(s.external_apps))), + before=lambda s_i: s_i[0].external_apps.append(xmlo.ExternalApp("", "", "")), + tags=[ + xmlo.Tag("title", + get=lambda s_i, x: setattr(s_i[0].external_apps[s_i[1]], "title", x), + set=lambda s_i: s_i[0].external_apps[s_i[1]].title), + xmlo.Tag("name", + get=lambda s_i, x: setattr(s_i[0].external_apps[s_i[1]], "key", x), + set=lambda s_i: s_i[0].external_apps[s_i[1]].key), + xmlo.Tag("program", + get=lambda s_i, x: setattr(s_i[0].external_apps[s_i[1]], "prog", x), + set=lambda s_i: s_i[0].external_apps[s_i[1]].prog)] + )]), - xmlo.TagMany("app", - iterfunc=lambda s: range(len(s.external_apps)), - before=lambda (s,i): - s.external_apps.append(ExternalApp("", "", "")), - tags=[ - xmlo.Tag("title", - get=lambda (s,i),x: - setattr(s.external_apps[i], "title", x), - set=lambda (s,i): s.external_apps[i].title), - xmlo.Tag("name", - get=lambda (s,i),x: - setattr(s.external_apps[i], "key", x), - set=lambda (s,i): s.external_apps[i].key), - xmlo.Tag("program", - get=lambda (s,i),x: - setattr(s.external_apps[i], "prog", x), - set=lambda (s,i): s.external_apps[i].prog)] - )] - - ), xmlo.Tag("timestamp_formats", tags=[ xmlo.TagMany("timestamp_format", - iterfunc=lambda s: range(len(s.timestamp_formats)), - before=lambda (s,i): setattr(s, "_last_timestamp_name", "") or - setattr(s, "_last_timestamp_format", ""), - after=lambda (s,i): - s.timestamp_formats.__setitem__( - s._last_timestamp_name, - s._last_timestamp_format), - tags=[ - xmlo.Tag("name", - get=lambda (s,i),x: setattr(s, "_last_timestamp_name", x), - set=lambda (s,i): s.timestamp_formats.keys()[i]), - xmlo.Tag("format", - get=lambda (s,i),x: setattr(s, "_last_timestamp_format", x), - set=lambda (s,i): s.timestamp_formats.values()[i]) - ] - )] - ) - ])) - - + iterfunc=lambda s: list(range(len(s.timestamp_formats))), + before=lambda s_i: (setattr(s_i[0], "_last_timestamp_name", ""), + setattr(s_i[0], "_last_timestamp_format", "")), + after=lambda s_i: s_i[0].timestamp_formats.__setitem__( + s_i[0]._last_timestamp_name, + s_i[0]._last_timestamp_format), + tags=[ + xmlo.Tag("name", + get=lambda s_i, x: setattr(s_i[0], "_last_timestamp_name", x), + set=lambda s_i: list(s_i[0].timestamp_formats.keys())[s_i[1]]), + xmlo.Tag("format", + get=lambda s_i, x: setattr(s_i[0], "_last_timestamp_format", x), + set=lambda s_i: list(s_i[0].timestamp_formats.values())[s_i[1]]) + ] + )]) + ])) \ No newline at end of file diff --git a/keepnote/compat/xmlobject_v1.py b/keepnote/compat/xmlobject_v1.py index cfbf99ee0..2c83e1f5c 100644 --- a/keepnote/compat/xmlobject_v1.py +++ b/keepnote/compat/xmlobject_v1.py @@ -7,26 +7,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - # python imports import sys import codecs @@ -37,7 +17,7 @@ import xml.parsers.expat from xml.sax.saxutils import escape -# keepnote imports +# keepnote.py imports from keepnote import safefile @@ -46,7 +26,7 @@ -class XmlError (StandardError): +class XmlError (Exception): """Error for parsing XML""" pass @@ -95,7 +75,7 @@ def write(self, obj, out): child_tag.write(obj, out) elif self._write_data: text = self._write_data(obj) - if not isinstance(text, basestring): + if not isinstance(text, str): raise XmlError("bad text (%s,%s): %s" % (self.name, str(self._object), str(type(text)))) @@ -125,7 +105,7 @@ def end_tag(self): try: self._read_data(self._object, data) - except Exception, e: + except Exception as e: raise XmlError("Error parsing tag '%s': %s" % (self.name, str(e))) @@ -179,7 +159,7 @@ def end_tag(self): try: if self._read_item is not None: self._read_item((self._object, self._index), data) - except Exception, e: + except Exception as e: raise XmlError("Error parsing tag '%s': %s" % (tag.name, str(e))) @@ -247,7 +227,7 @@ def __char_data(self, data): def read(self, obj, filename): - if isinstance(filename, basestring): + if isinstance(filename, str): infile = open(filename, "r") else: infile = filename @@ -262,18 +242,18 @@ def read(self, obj, filename): try: parser.ParseFile(infile) - except xml.parsers.expat.ExpatError, e: + except xml.parsers.expat.ExpatError as e: raise XmlError("Error reading file '%s': %s" % (filename, str(e))) if len(self._current_tags) > 1: - print [x.name for x in self._current_tags] + print([x.name for x in self._current_tags]) raise XmlError("Incomplete file '%s'" % filename) infile.close() def write(self, obj, filename): - if isinstance(filename, basestring): + if isinstance(filename, str): #out = codecs.open(filename, "w", "utf-8") out = safefile.open(filename, "w", codec="utf-8") #out = file(filename, "w") @@ -292,17 +272,17 @@ def write(self, obj, filename): if __name__ == "__main__": - import StringIO + import io parser = XmlObject( Tag("notebook", tags=[ - Tag("window_size", + Tag("window_size", get=lambda s, x: s.__setattr__("window_size", - tuple(map(int,x.split(",")))), + tuple(map(int, x.split(",")))), set=lambda s: "%d,%d" % s.window_size), Tag("window_pos", - getobj=("window_pos", lambda x: - tuple(map(int,x.split(",")))), + getobj=("window_pos", lambda x: + tuple(map(int, x.split(",")))), set=lambda s: "%d,%d" % s.window_pos), Tag("vsash_pos", get=lambda s, x: s.__setattr__("vhash_pos", int(x)), @@ -312,19 +292,20 @@ def write(self, obj, filename): set=lambda s: "%d" % s.hsash_pos), Tag("external_apps", tags=[ TagMany("app", - iterfunc=lambda s: range(len(s.apps)), - get=lambda (s,i), x: s.apps.append(x), - set=lambda (s,i): s.apps[i])]), + iterfunc=lambda s: list(range(len(s.apps))), + get=lambda s_and_i, x: s_and_i[0].apps.append(x), + set=lambda s_i2: s_i2[0].apps[s_i2[1]])]), Tag("external_apps2", tags=[ TagMany("app", - iterfunc=lambda s: range(len(s.apps2)), - before=lambda s,i: s.apps2.append([None, None]), - tags=[Tag("name", - get=lambda (s,i),x: s.apps2[i].__setitem__(0, x), - set=lambda (s,i): s.apps2[i][0]), - Tag("prog", - get=lambda (s,i),x: s.apps2[i].__setitem__(1,x), - set=lambda (s,i): s.apps2[i][1]) + iterfunc=lambda s: list(range(len(s.apps2))), + before=lambda s_i: s_i[0].apps2.append([None, None]), + tags=[ + Tag("name", + get=lambda s_i, x: s_i[0].apps2[s_i[1]].__setitem__(0, x), + set=lambda s_i: s_i[0].apps2[s_i[1]][0]), + Tag("prog", + get=lambda s_i, x: s_i[0].apps2[s_i[1]].__setitem__(1, x), + set=lambda s_i1: s_i1[0].apps2[s_i1[1]][1]) ]) ]), ])) @@ -348,7 +329,7 @@ def write(self, filename): util.tic("run") - infile = StringIO.StringIO(""" + infile = io.StringIO(""" 1053,905 0,0 @@ -365,7 +346,7 @@ def write(self, filename): """) - for i in xrange(1):#0000): + for i in range(1):#0000): pref = Pref() pref.read(infile) pref.write(sys.stdout) diff --git a/keepnote/compat/xmlobject_v3.py b/keepnote/compat/xmlobject_v3.py index d9c932cc0..1939c3f7e 100644 --- a/keepnote/compat/xmlobject_v3.py +++ b/keepnote/compat/xmlobject_v3.py @@ -1,47 +1,25 @@ """ - XmlObject This module allows concise definitions of XML file formats for python objects. - """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -# python imports + +# Python imports import sys import codecs +import builtins # Explicitly import builtins to access set -# xml imports +# XML imports import xml.parsers.expat from xml.sax.saxutils import escape -# keepnote imports +# KeepNote imports from keepnote import safefile - - -class XmlError (StandardError): +class XmlError(Exception): """Error for parsing XML""" pass @@ -50,77 +28,72 @@ def bool2str(b): """Convert a bool into a string""" return str(int(b)) + def str2bool(s): """Convert a string into a bool""" return bool(int(s)) - + + def str_no_none(x): if x is None: - return u"" + return "" return x -class Tag (object): - def __init__(self, name, - get=None, - set=None, - attr=None, - tags=[]): - self.name = name - +class Tag: + def __init__(self, name, get=None, set=None, attr=None, tags=None): + if tags is None: + tags = [] + self.name = name + self._tag_list = list(tags) self._read_data = get self._write_data = set self._object = None self._data = [] - # set read/write based on 'attr' + # Set read/write based on 'attr' if attr is not None: attr_name, attr_get, attr_set = attr - + if attr_get is None: - self._read_data = lambda s,x: s.__setattr__(attr_name, x) + self._read_data = lambda s, x: s.__setattr__(attr_name, x) else: - self._read_data = lambda s,x: s.__setattr__(attr_name, attr_get(x)) + self._read_data = lambda s, x: s.__setattr__(attr_name, attr_get(x)) if attr_set is None: self._write_data = lambda s: str_no_none(s.__dict__[attr_name]) else: self._write_data = lambda s: attr_set(s.__dict__[attr_name]) - - # init tag lookup + # Init tag lookup self._tags = {} for tag in tags: self._tags[tag.name] = tag - # set of initialized tags - self._init_tags = __builtins__["set"]() - + # Set of initialized tags, using builtins.set to avoid namespace issues + self._init_tags = builtins.set() #=========================================== - # reading + # Reading def init(self): - """Initialize the a tag before its first use""" + """Initialize the tag before its first use""" self._init_tags.clear() - def set_object(self, obj): self._object = obj - def new_tag(self, name): """Create new child tag""" - tag = self._tags.get(name, None) if tag: - # initialize new tag + # Initialize new tag tag.set_object(self._object) if tag not in self._init_tags: tag.init() - self._init_tags.add(tag) + self._init_tags.add(tag) return tag def start_tag(self): @@ -129,69 +102,55 @@ def start_tag(self): def queue_data(self, data): """Content data callback""" - if self._read_data: self._data.append(data) def end_tag(self): """End tag callback""" - - # read queued data if read function is supplied + # Read queued data if read function is supplied if self._read_data: data = "".join(self._data) self._data = [] - + try: self._read_data(self._object, data) - except Exception, e: - raise XmlError("Error parsing tag '%s': %s" % (self.name, - str(e))) - + except Exception as e: + raise XmlError(f"Error parsing tag '{self.name}': {str(e)}") + def add(self, tag): """Add a tag child to this tag""" - self._tag_list.append(tag) self._tags[tag.name] = tag - #=================== - # writing + # Writing def write(self, obj, out): """Write tag to output stream""" - - # write openning + # Write opening if self.name != "": - out.write("<%s>" % self.name) - + out.write(f"<{self.name}>") + if len(self._tags) > 0: out.write("\n") for child_tag in self._tag_list: child_tag.write(obj, out) elif self._write_data: text = self._write_data(obj) - if not isinstance(text, basestring): - raise XmlError("bad text (%s,%s): %s" % - (self.name, str(self._object), - str(type(text)))) + if not isinstance(text, str): + raise XmlError(f"bad text ({self.name},{str(self._object)}): {str(type(text))}") out.write(escape(text)) - + if self.name != "": - out.write("\n" % self.name) - - -# TODO: remove get? - -class TagMany (Tag): - def __init__(self, name, iterfunc, get=None, set=None, - before=None, - after=None, - tags=[]): - Tag.__init__(self, name, - get=None, - set=set, - tags=tags) - + out.write(f"\n") + + +class TagMany(Tag): + def __init__(self, name, iterfunc, get=None, set=None, before=None, after=None, tags=None): + if tags is None: + tags = [] + super().__init__(name, get=None, set=set, tags=tags) + self._iterfunc = iterfunc self._read_item = get self._write_item = set @@ -199,26 +158,24 @@ def __init__(self, name, iterfunc, get=None, set=None, self._afterfunc = after self._index = 0 - #============================= - # reading + # Reading def init(self): - """Initialize the a tag before its first use""" + """Initialize the tag before its first use""" self._init_tags.clear() self._index = 0 - def new_tag(self, name): """Create new child tag""" tag = self._tags.get(name, None) if tag: - # initialize new tag + # Initialize new tag tag.set_object((self._object, self._index)) if tag not in self._init_tags: tag.init() - self._init_tags.add(tag) + self._init_tags.add(tag) return tag def start_tag(self): @@ -234,121 +191,81 @@ def queue_data(self, data): def end_tag(self): """End tag callback""" - if self._read_item: data = "".join(self._data) self._data = [] - - #try: - if 1: - if self._read_item is not None: - self._read_item((self._object, self._index), data) - #except Exception, e: - # raise XmlError("Error parsing tag '%s': %s" % (self.name, - # str(e))) - + + if self._read_item is not None: + self._read_item((self._object, self._index), data) + if self._afterfunc: self._afterfunc((self._object, self._index)) self._index += 1 - #===================== - # writing - + # Writing + def write(self, obj, out): - # write opening + # Write opening if len(self._tags) == 0: assert self._write_item is not None - + for i in self._iterfunc(obj): - out.write("<%s>%s\n" % (self.name, - escape(self._write_item((obj, i))), - self.name)) + out.write(f"<{self.name}>{escape(self._write_item((obj, i)))}\n") else: for i in self._iterfunc(obj): - out.write("<%s>\n" % self.name) + out.write(f"<{self.name}>\n") for child_tag in self._tag_list: child_tag.write((obj, i), out) - out.write("\n" % self.name) - -''' -# TODO: remove get? - -class TagList (TagMany): - """A specialization of TagMany to work with reading and writing lists""" - - def __init__(self, name, lst, get=None, set=None, before=None, after=None, - tags=[]): - TagMany.__init__(self, name, self._iter, - get=get, set=set, - before=before, after=after, tags=tags) - - self._list = lst + out.write(f"\n") - def new_tag(self, name): - tag = self._tags.get(name, None) - if tag: - tag.set_object(self._list) - return tag -''' - -class XmlObject (object): +class XmlObject: """Represents an object <--> XML document binding""" - + def __init__(self, *tags): self._object = None self._root_tag = Tag("", tags=tags) self._current_tags = [self._root_tag] - - + def __start_element(self, name, attrs): """Start tag callback""" - if len(self._current_tags) > 0: last_tag = self._current_tags[-1] if last_tag: new_tag = last_tag.new_tag(name) self._current_tags.append(new_tag) - if new_tag: + if new_tag: new_tag.start_tag() - - + def __end_element(self, name): """End tag callback""" - if len(self._current_tags) > 0: last_tag = self._current_tags.pop() if last_tag: if last_tag.name == name: last_tag.end_tag() else: - raise XmlError("Malformed XML") + raise XmlError("Malformed XML") - - def __char_data(self, data): - """read character data and give it to current tag""" - + """Read character data and give it to current tag""" if len(self._current_tags) > 0: tag = self._current_tags[-1] if tag: tag.queue_data(data) - - - + def read(self, obj, filename): """Read XML from 'filename' and store data into object 'obj'""" - - if isinstance(filename, basestring): - infile = open(filename, "r") + if isinstance(filename, str): + infile = open(filename, "r", encoding="utf-8") else: infile = filename self._object = obj self._root_tag.set_object(self._object) self._current_tags = [self._root_tag] self._root_tag.init() - + parser = xml.parsers.expat.ParserCreate() parser.StartElementHandler = self.__start_element parser.EndElementHandler = self.__end_element @@ -356,73 +273,71 @@ def read(self, obj, filename): try: parser.ParseFile(infile) - except xml.parsers.expat.ExpatError, e: - raise XmlError("Error reading file '%s': %s" % (filename, str(e))) + except xml.parsers.expat.ExpatError as e: + raise XmlError(f"Error reading file '{filename}': {str(e)}") if len(self._current_tags) > 1: - print [x.name for x in self._current_tags] - raise XmlError("Incomplete file '%s'" % filename) - + print([x.name for x in self._current_tags]) + raise XmlError(f"Incomplete file '{filename}'") + infile.close() - def write(self, obj, filename): """Write object 'obj' to file 'filename'""" - - if isinstance(filename, basestring): - #out = codecs.open(filename, "w", "utf-8") - out = safefile.open(filename, "w", codec="utf-8") + if isinstance(filename, str): + out = safefile.open(filename, "w", codec="utf-8") need_close = True else: out = filename need_close = False - - out.write(u"") + + out.write('') self._root_tag.write(obj, out) - out.write(u"\n") + out.write("\n") if need_close: out.close() - - if __name__ == "__main__": - import StringIO + import io parser = XmlObject( Tag("notebook", tags=[ Tag("window_size", attr=("window_size", lambda x: tuple(map(int, x.split(","))), - lambda x: "%d,%d" % x)), + lambda x: f"{x[0]},{x[1]}")), Tag("window_pos", attr=("window_pos", lambda x: tuple(map(int, x.split(","))), - lambda x: "%d,%d" % x)), + lambda x: f"{x[0]},{x[1]}")), Tag("vsash_pos", attr=("vhash_pos", int, str)), Tag("hsash_pos", attr=("hsash_pos", int, str)), Tag("external_apps", tags=[ TagMany("app", - iterfunc=lambda s: range(len(s.apps)), - get=lambda (s,i), x: s.apps.append(x), - set=lambda (s,i): s.apps[i])]), + iterfunc=lambda s: list(range(len(s.apps))), + get=lambda s_i, x: s_i[0].apps.append(x), + set=lambda s_i: s_i[0].apps[s_i[1]]), + ]), Tag("external_apps2", tags=[ TagMany("app", - iterfunc=lambda s: range(len(s.apps2)), - before=lambda (s,i): s.apps2.append([None, None]), - tags=[Tag("name", - get=lambda (s,i),x: s.apps2[i].__setitem__(0, x), - set=lambda (s,i): s.apps2[i][0]), - Tag("prog", - get=lambda (s,i),x: s.apps2[i].__setitem__(1,x), - set=lambda (s,i): s.apps2[i][1]) + iterfunc=lambda s: list(range(len(s.apps2))), + before=lambda s_i: s_i[0].apps2.append([None, None]), + tags=[ + Tag("name", + get=lambda s_i, x: s_i[0].apps2[s_i[1]].__setitem__(0, x), + set=lambda s_i: s_i[0].apps2[s_i[1]][0]), + Tag("prog", + get=lambda s_i, x: s_i[0].apps2[s_i[1]].__setitem__(1, x), + set=lambda s_i: s_i[0].apps2[s_i[1]][1]) ]) ]), - ])) + ]) + ) - class Pref (object): + class Pref: def __init__(self): self.window_size = (0, 0) self.window_pos = (0, 0) @@ -430,18 +345,14 @@ def __init__(self): self.hsash_pos = 0 self.apps = [] self.apps2 = [] - + def read(self, filename): parser.read(self, filename) - + def write(self, filename): parser.write(self, filename) - - #from rasmus import util - - #util.tic("run") - infile = StringIO.StringIO(""" + infile = io.StringIO(""" 1053,905 0,0 @@ -457,24 +368,8 @@ def write(self, filename): """) - - for i in xrange(1):#0000): + + for i in range(1): # 0000): pref = Pref() pref.read(infile) - pref.write(sys.stdout) - - #util.toc() - - - - - -''' -def get_dom_children(node): - """Convenience function for iterating the children of a DOM object""" - child = node.firstChild - while child: - yield child - child = child.nextSibling -''' - + pref.write(sys.stdout) \ No newline at end of file diff --git a/keepnote/extension.py b/keepnote/extension.py index cf03178ca..4cea07c94 100644 --- a/keepnote/extension.py +++ b/keepnote/extension.py @@ -3,27 +3,11 @@ Extension system """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -import imp + + +# import imp +import importlib.util +import sys import os try: import xml.etree.cElementTree as ET @@ -36,11 +20,11 @@ # globals -EXTENSION_EXT = u".kne" # filename extension for KeepNote Extensions -INFO_FILE = u"info.xml" +EXTENSION_EXT = ".kne" # filename extension for KeepNote Extensions +INFO_FILE = "info.xml" -class DependencyError (StandardError): +class DependencyError (Exception): """Exception for dependency error""" def __init__(self, ext, dep): self.ext = ext @@ -66,12 +50,12 @@ def init_user_extensions(pref_dir=None, home=None): extensions_dir = keepnote.get_user_extensions_dir(pref_dir) if not os.path.exists(extensions_dir): # make user extensions directory - os.makedirs(extensions_dir, 0700) + os.makedirs(extensions_dir, 0o700) extensions_data_dir = keepnote.get_user_extensions_data_dir(pref_dir) if not os.path.exists(extensions_data_dir): # make user extensions data directory - os.makedirs(extensions_data_dir, 0700) + os.makedirs(extensions_data_dir, 0o700) def scan_extensions_dir(extensions_dir): @@ -83,28 +67,34 @@ def scan_extensions_dir(extensions_dir): def import_extension(app, name, filename): - """Import an Extension""" - filename2 = os.path.join(filename, u"__init__.py") + if "notebook_http" in filename: + print(f"Skipping extension 'notebook_http' due to missing dependencies") + return None + """Import an Extension using importlib""" + filename2 = os.path.join(filename, "__init__.py") - try: - infile = open(filename2) - except Exception, e: - raise keepnote.KeepNotePreferenceError("cannot load extension '%s'" % - filename, e) + if not os.path.isfile(filename2): + raise keepnote.KeepNotePreferenceError(f"Cannot load extension '{filename}' - __init__.py not found") try: - mod = imp.load_module(name, infile, filename2, - (".py", "rb", imp.PY_SOURCE)) + # Load the module using importlib + spec = importlib.util.spec_from_file_location(name, filename2) + if spec is None or spec.loader is None: + raise keepnote.KeepNotePreferenceError(f"Cannot load extension '{filename}' - spec could not be created") + + mod = importlib.util.module_from_spec(spec) + sys.modules[name] = mod + spec.loader.exec_module(mod) + + # Initialize the extension ext = mod.Extension(app) ext.key = name ext.read_info() - infile.close() + return ext - except Exception, e: - infile.close() - raise keepnote.KeepNotePreferenceError("cannot load extension '%s'" % - filename, e) + except Exception as e: + raise keepnote.KeepNotePreferenceError(f"Cannot load extension '{filename}'", e) def get_extension_info_file(filename): @@ -241,7 +231,7 @@ def get_depends(self): Dependencies returned as a list of tuples (NAME, REL, EXTRA) - NAME is a string identify an extension (or 'keepnote' itself). + NAME is a string identify an extension (or 'keepnote.py' itself). EXTRA is an object whose type depends on REL REL is a string representing a relation. Options are: @@ -267,7 +257,7 @@ def get_depends(self): name can appear more than once if several relations are required (such as specifying a range of valid version numbers). """ - return [("keepnote", ">=", (0, 6, 1))] + return [("keepnote.py", ">=", (0, 6, 1))] #=============================== # filesystem paths diff --git a/keepnote/extensions/backup_tar/__init__.py b/keepnote/extensions/backup_tar/__init__.py index 62d404172..c90b9b6de 100644 --- a/keepnote/extensions/backup_tar/__init__.py +++ b/keepnote/extensions/backup_tar/__init__.py @@ -5,25 +5,6 @@ Tar file notebook backup """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - import gettext import os import re @@ -31,312 +12,263 @@ import sys import time -#_ = gettext.gettext - import keepnote from keepnote import unicode_gtk from keepnote.notebook import NoteBookError, get_unique_filename from keepnote import notebook as notebooklib from keepnote import tasklib from keepnote import tarfile -from keepnote.gui import extension, FileChooserDialog - -# pygtk imports -try: - import pygtk - pygtk.require('2.0') - from gtk import gdk - import gtk.glade - import gobject -except ImportError: - # do not fail on gtk import error, - # extension should be usable for non-graphical uses - pass +from keepnote.gui import extension +# GTK4 imports +from gi import require_version +require_version('Gtk', '4.0') +from gi.repository import Gtk, Gio, Gdk - -class Extension (extension.Extension): +class Extension(extension.Extension): def __init__(self, app): """Initialize extension""" - extension.Extension.__init__(self, app) self.app = app - def get_depends(self): - return [("keepnote", ">=", (0, 7, 1))] - + return [("keepnote.py", ">=", (0, 7, 1))] def on_add_ui(self, window): """Initialize extension for a particular window""" - - # add menu options - self.add_action(window, "Backup Notebook", "_Backup Notebook...", - lambda w: self.on_archive_notebook( - window, window.get_notebook())) - self.add_action(window, "Restore Notebook", "R_estore Notebook...", - lambda w: self.on_restore_notebook(window)) - - # add menu items - self.add_ui(window, - """ - - - - - - - - - - - """) - + # Add actions for the application + action = Gio.SimpleAction.new("backup-notebook", None) + action.connect("activate", lambda action, param: self.on_archive_notebook(window, window.get_notebook())) + window.add_action(action) + + action = Gio.SimpleAction.new("restore-notebook", None) + action.connect("activate", lambda action, param: self.on_restore_notebook(window)) + window.add_action(action) + + # Add menu items using GMenu + app = window.get_application() + menu = app.get_menubar() + if not menu: + menu = Gio.Menu() + app.set_menubar(menu) + + file_menu = None + for i in range(menu.get_n_items()): + if menu.get_item_attribute_value(i, "label").get_string() == "_File": + file_menu = menu.get_item_link(i, "submenu") + break + + if not file_menu: + file_menu = Gio.Menu() + menu.append_submenu("_File", file_menu) + + extensions_menu = None + for i in range(file_menu.get_n_items()): + if file_menu.get_item_attribute_value(i, "label").get_string() == "Extensions": + extensions_menu = file_menu.get_item_link(i, "submenu") + break + + if not extensions_menu: + extensions_menu = Gio.Menu() + file_menu.append_submenu("Extensions", extensions_menu) + + extensions_menu.append("_Backup Notebook...", "win.backup-notebook") + extensions_menu.append("R_estore Notebook...", "win.restore-notebook") def on_archive_notebook(self, window, notebook): - """Callback from gui for archiving a notebook""" - + """Callback for archiving a notebook""" if notebook is None: return - dialog = FileChooserDialog( - "Backup Notebook", window, - action=gtk.FILE_CHOOSER_ACTION_SAVE, - buttons=("Cancel", gtk.RESPONSE_CANCEL, - "Backup", gtk.RESPONSE_OK), - app=self.app, - persistent_path="archive_notebook_path") - + dialog = Gtk.FileChooserDialog( + title="Backup Notebook", + transient_for=window, + action=Gtk.FileChooserAction.SAVE, + buttons=( + ("Cancel", Gtk.ResponseType.CANCEL), + ("Backup", Gtk.ResponseType.OK) + ) + ) path = self.app.get_default_path("archive_notebook_path") if os.path.exists(path): filename = notebooklib.get_unique_filename( path, - os.path.basename(notebook.get_path()) + - time.strftime("-%Y-%m-%d"), ".tar.gz", ".") - else: - filename = os.path.basename(notebook.get_path()) + \ - time.strftime("-%Y-%m-%d") + u".tar.gz" - - dialog.set_current_name(os.path.basename(filename)) + os.path.basename(notebook.get_path()) + time.strftime("-%Y-%m-%d"), ".tar.gz", "." + ) + else: + filename = os.path.basename(notebook.get_path()) + time.strftime("-%Y-%m-%d") + ".tar.gz" + dialog.set_current_name(os.path.basename(filename)) - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern("*.tar.gz") file_filter.set_name("Archives (*.tar.gz)") dialog.add_filter(file_filter) - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern("*") file_filter.set_name("All files (*.*)") dialog.add_filter(file_filter) response = dialog.run() - if response == gtk.RESPONSE_OK and dialog.get_filename(): + if response == Gtk.ResponseType.OK and dialog.get_filename(): filename = unicode_gtk(dialog.get_filename()) dialog.destroy() - if u"." not in filename: - filename += u".tar.gz" + if "." not in filename: + filename += ".tar.gz" window.set_status("Archiving...") return self.archive_notebook(notebook, filename, window) - - - elif response == gtk.RESPONSE_CANCEL: + elif response == Gtk.ResponseType.CANCEL: dialog.destroy() return False - - def on_restore_notebook(self, window): - """Callback from gui for restoring a notebook from an archive""" - - dialog = FileChooserDialog( - "Chose Archive To Restore", window, - action=gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=("Cancel", gtk.RESPONSE_CANCEL, - "Restore", gtk.RESPONSE_OK), - app=self.app, - persistent_path="archive_notebook_path") - - file_filter = gtk.FileFilter() + """Callback for restoring a notebook from an archive""" + dialog = Gtk.FileChooserDialog( + title="Choose Archive To Restore", + transient_for=window, + action=Gtk.FileChooserAction.OPEN, + buttons=( + ("Cancel", Gtk.ResponseType.CANCEL), + ("Restore", Gtk.ResponseType.OK) + ) + ) + + file_filter = Gtk.FileFilter() file_filter.add_pattern("*.tar.gz") file_filter.set_name("Archive (*.tar.gz)") dialog.add_filter(file_filter) - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern("*") file_filter.set_name("All files (*.*)") dialog.add_filter(file_filter) response = dialog.run() - - if response == gtk.RESPONSE_OK and dialog.get_filename(): + if response == Gtk.ResponseType.OK and dialog.get_filename(): archive_filename = unicode_gtk(dialog.get_filename()) dialog.destroy() - - elif response == gtk.RESPONSE_CANCEL: + elif response == Gtk.ResponseType.CANCEL: dialog.destroy() return - - # choose new notebook name - dialog = FileChooserDialog( - "Choose New Notebook Name", window, - action=gtk.FILE_CHOOSER_ACTION_SAVE, - buttons=("Cancel", gtk.RESPONSE_CANCEL, - "New", gtk.RESPONSE_OK), - app=self.app, - persistent_path="new_notebook_path") - - file_filter = gtk.FileFilter() + # Choose new notebook name + dialog = Gtk.FileChooserDialog( + title="Choose New Notebook Name", + transient_for=window, + action=Gtk.FileChooserAction.SAVE, + buttons=( + ("Cancel", Gtk.ResponseType.CANCEL), + ("New", Gtk.ResponseType.OK) + ) + ) + + file_filter = Gtk.FileFilter() file_filter.add_pattern("*.nbk") file_filter.set_name("Notebook (*.nbk)") dialog.add_filter(file_filter) - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern("*.tar.gz") file_filter.set_name("Archives (*.tar.gz)") dialog.add_filter(file_filter) - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern("*") file_filter.set_name("All files (*.*)") dialog.add_filter(file_filter) response = dialog.run() - if response == gtk.RESPONSE_OK and dialog.get_filename(): + if response == Gtk.ResponseType.OK and dialog.get_filename(): notebook_filename = unicode_gtk(dialog.get_filename()) dialog.destroy() window.set_status("Restoring...") - self.restore_notebook(archive_filename, - notebook_filename, window) - - elif response == gtk.RESPONSE_CANCEL: + self.restore_notebook(archive_filename, notebook_filename, window) + elif response == Gtk.ResponseType.CANCEL: dialog.destroy() - - def archive_notebook(self, notebook, filename, window=None): """Archive a notebook""" - if notebook is None: return - - task = tasklib.Task(lambda task: - archive_notebook(notebook, filename, task)) - + task = tasklib.Task(lambda task: archive_notebook(notebook, filename, task)) if window: + window.wait_dialog("Creating archive '%s'..." % os.path.basename(filename), + "Beginning archive...", task) - window.wait_dialog("Creating archive '%s'..." % - os.path.basename(filename), - "Beginning archive...", - task) - - # check exceptions try: ty, error, tracebk = task.exc_info() if error: raise error window.set_status("Notebook archived") return True - - except NoteBookError, e: + except NoteBookError as e: window.set_status("") - window.error("Error while archiving notebook:\n%s" % e.msg, e, - tracebk) + window.error("Error while archiving notebook:\n%s" % e.msg, e, tracebk) return False - - except Exception, e: + except Exception as e: window.set_status("") window.error("unknown error", e, tracebk) return False - else: - archive_notebook(notebook, filename, None) - - def restore_notebook(self, archive_filename, notebook_filename, - window=None): + def restore_notebook(self, archive_filename, notebook_filename, window=None): """Restore notebook""" - if window: - - # make sure current notebook is closed window.close_notebook() + task = tasklib.Task(lambda task: restore_notebook(archive_filename, notebook_filename, True, task)) - task = tasklib.Task(lambda task: - restore_notebook(archive_filename, notebook_filename, True, task)) - - window.wait_dialog("Restoring notebook from '%s'..." % - os.path.basename(archive_filename), - "Opening archive...", - task) + window.wait_dialog("Restoring notebook from '%s'..." % os.path.basename(archive_filename), + "Opening archive...", task) - # check exceptions try: ty, error, tracebk = task.exc_info() if error: raise error window.set_status("Notebook restored") - - except NoteBookError, e: + except NoteBookError as e: window.set_status("") window.error("Error restoring notebook:\n%s" % e.msg, e, tracebk) return - - except Exception, e: + except Exception as e: window.set_status("") window.error("unknown error", e, tracebk) return - # open new notebook window.open_notebook(notebook_filename) - else: restore_notebook(archive_filename, notebook_filename, True, None) - def truncate_filename(filename, maxsize=100): if len(filename) > maxsize: filename = "..." + filename[-(maxsize-3):] return filename - def archive_notebook(notebook, filename, task=None): - """Archive notebook as *.tar.gz - - filename -- filename of archive to create - """ - if task is None: - # create dummy task if needed task = tasklib.Task() - if os.path.exists(filename): raise NoteBookError("File '%s' already exists" % filename) - # make sure all modifications are saved first try: notebook.save() - except Exception, e: + except Exception as e: raise NoteBookError("Could not save notebook before archiving", e) - - # perform archiving archive = tarfile.open(filename, "w:gz", format=tarfile.PAX_FORMAT) path = notebook.get_path() - # first count # of files nfiles = 0 for root, dirs, files in os.walk(path): nfiles += len(files) @@ -345,90 +277,53 @@ def archive_notebook(notebook, filename, task=None): nfiles2 = [0] def walk(path, arcname): - # add to archive archive.add(path, arcname, False) - - # report progresss if os.path.isfile(path): nfiles2[0] += 1 if task: task.set_message(("detail", truncate_filename(path))) task.set_percent(nfiles2[0] / float(nfiles)) - - # recurse if os.path.isdir(path): for f in os.listdir(path): - - # abort archive if task.aborted(): archive.close() os.remove(filename) raise NoteBookError("Backup canceled") - if not os.path.islink(f): - walk(os.path.join(path, f), - os.path.join(arcname, f)) + walk(os.path.join(path, f), os.path.join(arcname, f)) walk(path, os.path.basename(path)) - task.set_message(("text", "Closing archive...")) task.set_message(("detail", "")) - archive.close() - if task: task.finish() - - - def restore_notebook(filename, path, rename, task=None): - """ - Restores a archived notebook - - filename -- filename of archive - path -- name of new notebook - rename -- if True, path contains notebook name, otherwise path is - basedir of new notebook - """ - if task is None: - # create dummy task if needed task = tasklib.Task() - if path == "": raise NoteBookError("Must specify a path for restoring notebook") - # remove trailing "/" path = re.sub("/+$", "", path) - tar = tarfile.open(filename, "r:gz", format=tarfile.PAX_FORMAT) - - # create new dirctory, if needed if rename: if not os.path.exists(path): - tmppath = get_unique_filename(os.path.dirname(path), - os.path.basename(path+"-tmp")) + tmppath = get_unique_filename(os.path.dirname(path), os.path.basename(path + "-tmp")) else: raise NoteBookError("Notebook path already exists") try: - # extract notebook members = list(tar.getmembers()) - if task: - task.set_message(("text", "Restoring %d files..." % - len(members))) + task.set_message(("text", "Restoring %d files..." % len(members))) for i, member in enumerate(members): - # FIX: tarfile does not seem to keep unicode and str straight - # make sure member.name is unicode if 'path' in member.pax_headers: member.name = member.pax_headers['path'] - if task: if task.aborted(): raise NoteBookError("Restore canceled") @@ -437,102 +332,117 @@ def restore_notebook(filename, path, rename, task=None): tar.extract(member, tmppath) files = os.listdir(tmppath) - # assert len(files) = 1 extracted_path = os.path.join(tmppath, files[0]) - - # move extracted files to proper place if task: task.set_message(("text", "Finishing restore...")) shutil.move(extracted_path, path) os.rmdir(tmppath) - - except NoteBookError, e: + except NoteBookError as e: raise e - - except Exception, e: + except Exception as e: raise NoteBookError("File writing error while extracting notebook", e) - else: try: if task: task.set_message(("text", "Restoring archive...")) tar.extractall(path) - except Exception, e: + except Exception as e: raise NoteBookError("File writing error while extracting notebook", e) task.finish() +def on_archive_notebook(self, window, notebook): + """Callback for archiving a notebook""" + if notebook is None: + return + + dialog = Gtk.FileChooserDialog( + title="Backup Notebook", + transient_for=window, + action=Gtk.FileChooserAction.SAVE, + buttons=( + ("Cancel", Gtk.ResponseType.CANCEL), + ("Backup", Gtk.ResponseType.OK) + ) + ) + path = self.app.get_default_path("archive_notebook_path") + if os.path.exists(path): + filename = notebooklib.get_unique_filename( + path, + os.path.basename(notebook.get_path()) + time.strftime("-%Y-%m-%d"), ".zip", "." + ) + else: + filename = os.path.basename(notebook.get_path()) + time.strftime("-%Y-%m-%d") + ".zip" + + dialog.set_current_name(os.path.basename(filename)) + + # Add filters for both tar.gz and zip + tar_filter = Gtk.FileFilter() + tar_filter.add_pattern("*.tar.gz") + tar_filter.set_name("Tar Archives (*.tar.gz)") + dialog.add_filter(tar_filter) + + zip_filter = Gtk.FileFilter() + zip_filter.add_pattern("*.zip") + zip_filter.set_name("ZIP Archives (*.zip)") + dialog.add_filter(zip_filter) + dialog.set_filter(zip_filter) # Default to ZIP + + all_filter = Gtk.FileFilter() + all_filter.add_pattern("*") + all_filter.set_name("All files (*.*)") + dialog.add_filter(all_filter) + + response = dialog.run() + + if response == Gtk.ResponseType.OK and dialog.get_filename(): + filename = unicode_gtk(dialog.get_filename()) + dialog.destroy() + + # Determine archive type based on extension + if filename.endswith(".tar.gz"): + if "." not in filename[-7:]: + filename += ".tar.gz" + window.set_status("Archiving to tar.gz...") + return self.archive_notebook(notebook, filename, window) + elif filename.endswith(".zip"): + if "." not in filename[-4:]: + filename += ".zip" + window.set_status("Archiving to ZIP...") + return self.archive_notebook_zip(notebook, filename, window) + else: + window.set_status("") + window.error("Please select a valid archive format (.tar.gz or .zip)") + return False + elif response == Gtk.ResponseType.CANCEL: + dialog.destroy() + return False -#============================================================================= - - -def archive_notebook_zip(notebook, filename, task=None): - """Archive notebook as *.tar.gz +def archive_notebook_zip(self, notebook, filename, window=None): + """Wrapper for archive_notebook_zip function""" + if notebook is None: + return - filename -- filename of archive to create - progress -- callback function that takes arguments - (percent, filename) - """ + task = tasklib.Task(lambda task: archive_notebook_zip(notebook, filename, task)) - if os.path.exists(filename): - raise NoteBookError("File '%s' already exists" % filename) + if window: + window.wait_dialog("Creating ZIP archive '%s'..." % os.path.basename(filename), + "Beginning archive...", task) - # make sure all modifications are saved first - try: - notebook.save() - except Exception, e: - raise NoteBookError("Could not save notebook before archiving", e) - - # perform archiving - try: - #archive = tarfile.open(filename, "w:gz") - archive = zipfile.ZipFile(filename, "w", zipfile.ZIP_DEFLATED, True) - path = notebook.get_path() - - # first count # of files - nfiles = 0 - for root, dirs, files in os.walk(path): - nfiles += len(files) - - nfiles2 = [0] - abort = [False] - def walk(path, arcname): - # add to archive - #archive.add(path, arcname, False) - if os.path.isfile(path): - archive.write(path, arcname) - - # report progresss - if os.path.isfile(path): - nfiles2[0] += 1 - if task: - task.set_message(path) - task.set_percent(nfiles2[0] / float(nfiles)) - - - # recurse - if os.path.isdir(path): - for f in os.listdir(path): - - # abort archive - if not task.is_running(): - abort[0] = True - return - - if not os.path.islink(f): - walk(os.path.join(path, f), - os.path.join(arcname, f)) - - walk(path, os.path.basename(path)) - - archive.close() - - if abort[0]: - os.remove(filename) - elif task: - task.finish() - - - except Exception, e: - raise NoteBookError("Error while archiving notebook", e) + try: + ty, error, tracebk = task.exc_info() + if error: + raise error + window.set_status("Notebook archived as ZIP") + return True + except NoteBookError as e: + window.set_status("") + window.error("Error while archiving notebook:\n%s" % e.msg, e, tracebk) + return False + except Exception as e: + window.set_status("") + window.error("Unknown error", e, tracebk) + return False + else: + archive_notebook_zip(notebook, filename, None) \ No newline at end of file diff --git a/keepnote/extensions/command_basics/__init__.py b/keepnote/extensions/command_basics/__init__.py index a4acd7a62..33a652508 100644 --- a/keepnote/extensions/command_basics/__init__.py +++ b/keepnote/extensions/command_basics/__init__.py @@ -1,38 +1,22 @@ """ - KeepNote Extension - backup_tar +KeepNote Extension +backup_tar - Command-line basic commands +Command-line basic commands """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -# python imports +# Python imports import os import sys +import time -# gtk imports -import gobject +# PyGObject imports for GTK 4 +import gi -# keepnote imports +gi.require_version('Gtk', '4.0') +from gi.repository import GLib + +# KeepNote imports import keepnote from keepnote import AppCommand import keepnote.notebook @@ -41,11 +25,11 @@ import keepnote.gui.extension -class Extension (keepnote.gui.extension.Extension): - +class Extension(keepnote.gui.extension.Extension): + def __init__(self, app): """Initialize extension""" - + keepnote.gui.extension.Extension.__init__(self, app) self.app = app self.enabled.add(self.on_enabled) @@ -72,8 +56,8 @@ def __init__(self, app): AppCommand("ext_path", self.on_extension_path, metavar="PATH", help="add an extension path for this session"), - AppCommand("quit", lambda app, args: - gobject.idle_add(app.quit), + AppCommand("quit", lambda app, args: + GLib.idle_add(app.quit), help="close all KeepNote windows"), # notebook commands @@ -89,109 +73,140 @@ def __init__(self, app): AppCommand("upgrade", self.on_upgrade_notebook, metavar="[v VERSION] NOTEBOOK...", help="upgrade a notebook"), + AppCommand("backup", self.on_backup_notebook, + metavar="NOTEBOOK [ARCHIVE_NAME]", + help="backup a notebook to a tar archive"), # misc AppCommand("screenshot", self.on_screenshot, help="insert a new screenshot"), - - - ] - + ] def get_depends(self): - return [("keepnote", ">=", (0, 6, 4))] - + return [("keepnote.py", ">=", (0, 6, 4))] def on_enabled(self, enabled): - if enabled: for command in self.commands: if self.app.get_command(command.name): continue - try: self.app.add_command(command) - except Exception, e: - self.app.error("Could not add command '%s'" % command.name, - e, sys.exc_info()[2]) - + except Exception as e: + self.app.error(f"Could not add command '{command.name}'", e, sys.exc_info()[2]) else: for command in self.commands: self.app.remove_command(command.name) + def error(self, message): + """Print an error message to stderr""" + print(f"Error: {message}", file=sys.stderr) - #==================================================== + # ==================================================== # commands def on_minimize_windows(self, app, args): - for window in app.get_windows(): - window.iconify() + window.minimize() def on_toggle_windows(self, app, args): - for window in app.get_windows(): if window.is_active(): self.on_minimize_windows(app, args) return - app.focus_windows() - - def on_uninstall_extension(self, app, args): - - for extname in args[1:]: - app.uninstall_extension(extname) + if len(args) < 2: + self.error("Must specify extension name") + return + for extname in args[1:]: + try: + app.uninstall_extension(extname) + print(f"Successfully uninstalled extension '{extname}'") + except Exception as e: + self.error(f"Failed to uninstall extension '{extname}': {str(e)}") def on_install_extension(self, app, args): - + if len(args) < 2: + self.error("Must specify extension filename") + return + for filename in args[1:]: - app.install_extension(filename) + try: + app.install_extension(filename) + print(f"Successfully installed extension from '{filename}'") + except Exception as e: + self.error(f"Failed to install extension from '{filename}': {str(e)}") - def on_temp_extension(self, app, args): + if len(args) < 2: + self.error("Must specify extension filename") + return for filename in args[1:]: - entry = app.add_extension(filename, "temp") - ext = app.get_extension(entry.get_key()) - if ext: - app.init_extensions_windows(windows=None, exts=[ext]) - ext.enable(True) - + try: + entry = app.add_extension(filename, "temp") + ext = app.get_extension(entry.get_key()) + if ext: + app.init_extensions_windows(windows=None, exts=[ext]) + ext.enable(True) + print(f"Successfully added temporary extension from '{filename}'") + else: + self.error(f"Could not load extension from '{filename}'") + except Exception as e: + self.error(f"Failed to add temporary extension from '{filename}': {str(e)}") def on_extension_path(self, app, args): + if len(args) < 2: + self.error("Must specify extension path") + return exts = [] for extensions_dir in args[1:]: - for filename in keepnote.extension.iter_extensions(extensions_dir): - entry = app.add_extension_entry(filename, "temp") - ext = app.get_extension(entry.get_key()) - if ext: - exts.append(ext) - - app.init_extensions_windows(windows=None, exts=exts) - for ext in exts: - ext.enable(True) + try: + for filename in keepnote.extension.iter_extensions(extensions_dir): + entry = app.add_extension_entry(filename, "temp") + ext = app.get_extension(entry.get_key()) + if ext: + exts.append(ext) + except Exception as e: + self.error(f"Failed to load extensions from '{extensions_dir}': {str(e)}") + continue + try: + app.init_extensions_windows(windows=None, exts=exts) + for ext in exts: + ext.enable(True) + print(f"Successfully added {len(exts)} extensions from path(s): {', '.join(args[1:])}") + except Exception as e: + self.error(f"Failed to enable extensions: {str(e)}") def on_screenshot(self, app, args): window = app.get_current_window() - if window: - editor = window.get_viewer().get_editor() - if hasattr(editor, "get_editor"): - editor = editor.get_editor() - if hasattr(editor, "on_screenshot"): + if not window: + self.error("No active window found") + return + + editor = window.get_viewer().get_editor() + if hasattr(editor, "get_editor"): + editor = editor.get_editor() + + if hasattr(editor, "on_screenshot"): + try: editor.on_screenshot() - + print("Screenshot inserted successfully") + except Exception as e: + self.error(f"Failed to insert screenshot: {str(e)}") + else: + self.error("Editor does not support screenshot insertion") def on_view_note(self, app, args): - - if len(args) < 1: - self.error("Must specify note url") + if len(args) < 2: + self.error("Must specify note URL") return - + app.focus_windows() nodeurl = args[1] @@ -206,7 +221,7 @@ def on_view_note(self, app, args): notebook = window.get_notebook() if notebook is None: return - + results = list(notebook.search_node_titles(nodeurl)) if len(results) == 1: @@ -218,17 +233,14 @@ def on_view_note(self, app, args): node = notebook.get_node_by_id(nodeid) if node: viewer.add_search_result(node) - - def on_new_note(self, app, args): - - if len(args) < 1: - self.error("Must specify note url") + if len(args) < 2: + self.error("Must specify note URL") return - + app.focus_windows() - + nodeurl = args[1] window, notebook = self.get_window_notebook() nodeid = self.get_nodeid(nodeurl) @@ -238,13 +250,11 @@ def on_new_note(self, app, args): window.get_viewer().new_node( keepnote.notebook.CONTENT_TYPE_PAGE, "child", node) - def on_search_titles(self, app, args): - - if len(args) < 1: + if len(args) < 2: self.error("Must specify text to search") return - + # get window and notebook window = self.app.get_current_window() if window is None: @@ -252,16 +262,38 @@ def on_search_titles(self, app, args): notebook = window.get_notebook() if notebook is None: return - + # do search text = args[1] nodes = list(notebook.search_node_titles(text)) for nodeid, title in nodes: - print "%s\t%s" % (title, keepnote.notebook.get_node_url(nodeid)) + print(f"{title}\t{keepnote.notebook.get_node_url(nodeid)}") + def on_backup_notebook(self, app, args): + if len(args) < 2: + self.error("Must specify notebook path") + return + + notebook_path = args[1] + if not os.path.exists(notebook_path): + self.error(f"Notebook path does not exist: {notebook_path}") + return + + # Determine archive name + if len(args) >= 3: + archive_name = args[2] + else: + archive_name = f"{os.path.basename(notebook_path)}-{time.strftime('%Y%m%d')}.tar.gz" + + try: + import tarfile + with tarfile.open(archive_name, "w:gz") as tar: + tar.add(notebook_path, arcname=os.path.basename(notebook_path)) + print(f"Successfully created backup: {archive_name}") + except Exception as e: + self.error(f"Failed to create backup '{archive_name}': {str(e)}") def view_nodeid(self, app, nodeid): - for window in app.get_windows(): notebook = window.get_notebook() if not notebook: @@ -271,12 +303,10 @@ def view_nodeid(self, app, nodeid): window.get_viewer().goto_node(node) break - def get_nodeid(self, text): - if keepnote.notebook.is_node_url(text): host, nodeid = keepnote.notebook.parse_node_url(text) - return nodeid + return nodeid else: # do text search window = self.app.get_current_window() @@ -285,7 +315,7 @@ def get_nodeid(self, text): notebook = window.get_notebook() if notebook is None: return None - + results = list(notebook.search_node_titles(text)) if len(results) == 1: @@ -294,10 +324,8 @@ def get_nodeid(self, text): for nodeid, title in results: if title == text: return nodeid - return None - def get_window_notebook(self): window = self.app.get_current_window() if window is None: @@ -305,25 +333,29 @@ def get_window_notebook(self): notebook = window.get_notebook() return window, notebook - def on_upgrade_notebook(self, app, args): - version = keepnote.notebook.NOTEBOOK_FORMAT_VERSION i = 1 while i < len(args): if args[i] == "v": try: - version = int(args[i+1]) + version = int(args[i + 1]) i += 2 - except: - raise Exception("excepted version number") + except (IndexError, ValueError): + self.error("Expected version number after 'v'") + return else: break files = args[i:] + if not files: + self.error("Must specify at least one notebook to upgrade") + return for filename in files: - keepnote.log_message("upgrading notebook to version %d: %s\n" % - (version, filename)) - keepnote.notebook.update.update_notebook(filename, version, - verify=True) + keepnote.log_message(f"Upgrading notebook to version {version}: {filename}\n") + try: + keepnote.notebook.update.update_notebook(filename, version, verify=True) + print(f"Successfully upgraded notebook: {filename}") + except Exception as e: + self.error(f"Failed to upgrade notebook '{filename}': {str(e)}") \ No newline at end of file diff --git a/keepnote/extensions/editor_insert_date/__init__.py b/keepnote/extensions/editor_insert_date/__init__.py index 9ed4f4177..4e5717f8c 100644 --- a/keepnote/extensions/editor_insert_date/__init__.py +++ b/keepnote/extensions/editor_insert_date/__init__.py @@ -1,79 +1,46 @@ """ - - KeepNote - Insert date extension - +KeepNote +Insert date extension """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -# python imports +# Python imports import gettext import time import os import sys _ = gettext.gettext - -# keepnote imports +# KeepNote imports import keepnote from keepnote.gui import extension +from keepnote import safefile +from keepnote.gui.dialog_app_options import ApplicationOptionsDialog, Section +# PyGObject imports for GTK 4 +import gi +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, Gio -# pygtk imports -try: - import pygtk - pygtk.require('2.0') - import gtk - - from keepnote.gui import dialog_app_options -except ImportError: - # do not fail on gtk import error, - # extension should be usable for non-graphical uses - pass - - - -class Extension (extension.Extension): +class Extension(extension.Extension): def __init__(self, app): """Initialize extension""" - + extension.Extension.__init__(self, app) self._widget_focus = {} self._set_focus_id = {} - + self.format = "%Y/%m/%d" self.enabled.add(self.on_enabled) - def on_enabled(self, enabled): if enabled: self.load_config() - def get_depends(self): - return [("keepnote", ">=", (0, 7, 1))] + return [("keepnote.py", ">=", (0, 7, 1))] #=============================== # config handling @@ -84,136 +51,171 @@ def get_config_file(self): def load_config(self): config = self.get_config_file() if not os.path.exists(config): + self.format = "%Y-%m-%d" self.save_config() else: - self.format = open(config).readline() - + with open(config, "r", encoding="utf-8") as f: # Use text mode with UTF-8 + self.format = f.readline().strip() def save_config(self): config = self.get_config_file() - out = open(config, "w") - out.write(self.format) - out.close() + with safefile.safe_open(config, "w", codec="utf-8") as out: + out.write(self.format) - #================================ # UI setup def on_add_ui(self, window): - - # list to focus events from the window - self._set_focus_id[window] = window.connect("set-focus", self._on_focus) - - # add menu options - self.add_action(window, "Insert Date", "Insert _Date", - lambda w: self.insert_date(window)) - - self.add_ui(window, - """ - - - - - - - - - - - - - - """) + # listen to focus events from the window + self._set_focus_id[window] = window.connect("notify::focus-widget", self._on_focus) + + # add menu options using actions + action = Gio.SimpleAction.new("insert-date", None) + action.connect("activate", lambda action, param: self.insert_date(window)) + window.add_action(action) + + # add menu items using GMenu + app = window.get_application() + menu = app.get_menubar() + if not menu: + menu = Gio.Menu() + app.set_menubar(menu) + + edit_menu = None + for i in range(menu.get_n_items()): + if menu.get_item_attribute_value(i, "label").get_string() == "_Edit": + edit_menu = menu.get_item_link(i, "submenu") + break + + if not edit_menu: + edit_menu = Gio.Menu() + menu.append_submenu("_Edit", edit_menu) + + viewer_menu = None + for i in range(edit_menu.get_n_items()): + if edit_menu.get_item_attribute_value(i, "label") == "Viewer": + viewer_menu = edit_menu.get_item_link(i, "submenu") + break + + if not viewer_menu: + viewer_menu = Gio.Menu() + edit_menu.append_submenu("Viewer", viewer_menu) + + editor_menu = None + for i in range(viewer_menu.get_n_items()): + if viewer_menu.get_item_attribute_value(i, "label") == "Editor": + editor_menu = viewer_menu.get_item_link(i, "submenu") + break + + if not editor_menu: + editor_menu = Gio.Menu() + viewer_menu.append_submenu("Editor", editor_menu) + + extension_menu = None + for i in range(editor_menu.get_n_items()): + if editor_menu.get_item_attribute_value(i, "label") == "Extension": + extension_menu = editor_menu.get_item_link(i, "submenu") + break + + if not extension_menu: + extension_menu = Gio.Menu() + editor_menu.append_submenu("Extension", extension_menu) + + extension_menu.append("Insert _Date", "win.insert-date") def on_remove_ui(self, window): - extension.Extension.on_remove_ui(self, window) - + # disconnect window callbacks window.disconnect(self._set_focus_id[window]) del self._set_focus_id[window] - #================================= # Options UI setup def on_add_options_ui(self, dialog): - - dialog.add_section(EditorInsertDateSection("editor_insert_date", + dialog.add_section(EditorInsertDateSection("editor_insert_date", dialog, self._app, self), "extensions") - - def on_remove_options_ui(self, dialog): - dialog.remove_section("editor_insert_date") - #================================ # actions - - def _on_focus(self, window, widget): + def _on_focus(self, window, pspec): """Callback for focus change in window""" - self._widget_focus[window] = widget + self._widget_focus[window] = window.get_focus() - def insert_date(self, window): """Insert a date in the editor of a window""" - widget = self._widget_focus.get(window, None) - if isinstance(widget, gtk.TextView): + if isinstance(widget, Gtk.TextView): stamp = time.strftime(self.format, time.localtime()) widget.get_buffer().insert_at_cursor(stamp) - - -class EditorInsertDateSection (dialog_app_options.Section): +class EditorInsertDateSection(Section): """A Section in the Options Dialog""" def __init__(self, key, dialog, app, ext, - label=u"Editor Insert Date", + label="Editor Insert Date", icon=None): - dialog_app_options.Section.__init__(self, key, dialog, app, label, icon) + Section.__init__(self, key, dialog, app, label, icon) self.ext = ext w = self.get_default_widget() - v = gtk.VBox(False, 5) - w.add(v) - - table = gtk.Table(1, 2) - v.pack_start(table, False, True, 0) - - label = gtk.Label("Date format:") - table.attach(label, 0, 1, 0, 1, - xoptions=0, yoptions=0, - xpadding=2, ypadding=2) - - self.format = gtk.Entry() - table.attach(self.format, 1, 2, 0, 1, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) - - xml = gtk.glade.XML(dialog_app_options.get_resource("rc", "keepnote.glade"), - "date_and_time_key", keepnote.GETTEXT_DOMAIN) - key = xml.get_widget("date_and_time_key") - key.set_size_request(400, 200) - v.pack_start(key, True, True, 0) - - w.show_all() - + v = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) + w.append(v) + + table = Gtk.Grid() + table.set_row_spacing(5) + table.set_column_spacing(5) + v.append(table) + + label = Gtk.Label(label="Date format:") + table.attach(label, 0, 0, 1, 1) + + self.format = Gtk.Entry() + table.attach(self.format, 1, 0, 1, 1) + + # Add a help button for date format examples + help_button = Gtk.Button(label="Help with Date Formats") + help_button.connect("clicked", self.on_help_clicked) + table.attach(help_button, 1, 1, 1, 1) + + def on_help_clicked(self, button): + """Show a dialog with date format examples""" + dialog = Gtk.MessageDialog( + transient_for=self.dialog, + message_type=Gtk.MessageType.INFO, + buttons=Gtk.ButtonsType.OK, + text="Date Format Examples" + ) + dialog.set_deletable(True) + dialog.set_secondary_text( + "Use the following codes in the date format:\n" + "%Y - Year (e.g., 2025)\n" + "%m - Month (01-12)\n" + "%d - Day (01-31)\n" + "%H - Hour (00-23)\n" + "%M - Minute (00-59)\n" + "%S - Second (00-59)\n\n" + "Example formats:\n" + "%Y/%m/%d - 2025/03/28\n" + "%Y-%m-%d %H:%M:%S - 2025-03-28 14:30:00" + ) + dialog.run() + dialog.destroy() def load_options(self, app): """Load options from app to UI""" - self.format.set_text(self.ext.format) def save_options(self, app): """Save options to the app""" - self.ext.format = self.format.get_text() - self.ext.save_config() + self.ext.save_config() \ No newline at end of file diff --git a/keepnote/extensions/export_html/__init__.py b/keepnote/extensions/export_html/__init__.py index b4ae4b470..d75e23035 100644 --- a/keepnote/extensions/export_html/__init__.py +++ b/keepnote/extensions/export_html/__init__.py @@ -1,47 +1,23 @@ """ - - KeepNote - Export HTML Extension - +KeepNote +Export HTML Extension """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -# python imports +# Python imports import codecs import gettext import os import sys import time import shutil -import urllib +import urllib.request, urllib.parse, urllib.error import xml.dom from xml.dom import minidom from xml.sax.saxutils import escape - _ = gettext.gettext - -# keepnote imports +# KeepNote imports import keepnote from keepnote import unicode_gtk from keepnote.notebook import NoteBookError @@ -49,70 +25,77 @@ from keepnote import tasklib from keepnote import tarfile from keepnote.gui import extension, FileChooserDialog +from keepnote import safefile -# pygtk imports -try: - import pygtk - pygtk.require('2.0') - from gtk import gdk - import gtk.glade - import gobject -except ImportError: - # do not fail on gtk import error, - # extension should be usable for non-graphical uses - pass +# PyGObject imports for GTK 4 +import gi +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, Gio -class Extension (extension.Extension): - +class Extension(extension.Extension): + def __init__(self, app): """Initialize extension""" - + extension.Extension.__init__(self, app) self.app = app - def get_depends(self): - return [("keepnote", ">=", (0, 7, 1))] - + return [("keepnote.py", ">=", (0, 7, 1))] def on_add_ui(self, window): """Initialize extension for a particular window""" - - # add menu options - self.add_action(window, "Export HTML", "_HTML...", - lambda w: self.on_export_notebook( - window, window.get_notebook())) - - self.add_ui(window, - """ - - - - - - - - - - """) + # add menu options using actions + action = Gio.SimpleAction.new("export-html", None) + action.connect("activate", lambda action, param: self.on_export_notebook(window, window.get_notebook())) + window.add_action(action) + + # add menu items using GMenu + app = window.get_application() + menu = app.get_menubar() + if not menu: + menu = Gio.Menu() + app.set_menubar(menu) + + file_menu = None + for i in range(menu.get_n_items()): + if menu.get_item_attribute_value(i, "label").get_string() == "_File": + file_menu = menu.get_item_link(i, "submenu") + break + + if not file_menu: + file_menu = Gio.Menu() + menu.append_submenu("_File", file_menu) + + export_menu = None + for i in range(file_menu.get_n_items()): + if file_menu.get_item_attribute_value(i, "label") == "Export": + export_menu = file_menu.get_item_link(i, "submenu") + break + + if not export_menu: + export_menu = Gio.Menu() + file_menu.append_submenu("Export", export_menu) + + export_menu.append("_HTML...", "win.export-html") def on_export_notebook(self, window, notebook): """Callback from gui for exporting a notebook""" - + if notebook is None: return - dialog = FileChooserDialog("Export Notebook", window, - action=gtk.FILE_CHOOSER_ACTION_SAVE, - buttons=("Cancel", gtk.RESPONSE_CANCEL, - "Export", gtk.RESPONSE_OK), + dialog = FileChooserDialog( + "Export Notebook", window, + action=Gtk.FileChooserAction.SAVE, + buttons=(("Cancel", Gtk.ResponseType.CANCEL), + ("Export", Gtk.ResponseType.OK)), app=self.app, persistent_path="archive_notebook_path") - basename = time.strftime(os.path.basename(notebook.get_path()) + "-%Y-%m-%d") @@ -123,24 +106,22 @@ def on_export_notebook(self, window, notebook): else: filename = basename dialog.set_current_name(os.path.basename(filename)) - + response = dialog.run() - if response == gtk.RESPONSE_OK and dialog.get_filename(): + if response == Gtk.ResponseType.OK and dialog.get_filename(): filename = unicode_gtk(dialog.get_filename()) dialog.destroy() self.export_notebook(notebook, filename, window=window) else: dialog.destroy() - def export_notebook(self, notebook, filename, window=None): - + if notebook is None: return if window: - task = tasklib.Task(lambda task: export_notebook(notebook, filename, task)) @@ -157,29 +138,30 @@ def export_notebook(self, notebook, filename, window=None): window.set_status("Notebook exported") return True - except NoteBookError, e: + except NoteBookError as e: window.set_status("") window.error("Error while exporting notebook:\n%s" % e.msg, e, tracebk) return False - except Exception, e: + except Exception as e: window.set_status("") window.error("unknown error", e, tracebk) return False else: - export_notebook(notebook, filename, None) def truncate_filename(filename, maxsize=100): if len(filename) > maxsize: - filename = "..." + filename[-(maxsize-3):] + filename = "..." + filename[-(maxsize - 3):] return filename def relpath(path, start): + path = os.path.normpath(path) + start = os.path.normpath(start) head, tail = path, None head2, tail2 = start, None @@ -192,31 +174,27 @@ def relpath(path, start): rel.append(tail) else: head2, tail2 = os.path.split(head2) - rel2.append(u"..") + rel2.append("..") rel2.extend(reversed(rel)) - return u"/".join(rel2) - + return "/".join(rel2) + def nodeid2html_link(notebook, path, nodeid): note = notebook.get_node_by_id(nodeid) if note: newpath = relpath(note.get_path(), path) if note.get_attr("content_type") == "text/xhtml+xml": - newpath = u"/".join((newpath, u"page.html")) - + newpath = "/".join((newpath, "page.html")) elif note.has_attr("payload_filename"): - newpath = u"/".join((newpath, note.get_attr("payload_filename"))) - - return urllib.quote(newpath.encode("utf8")) + newpath = "/".join((newpath, note.get_attr("payload_filename"))) + return urllib.parse.quote(newpath.encode("utf8")) else: return "" def translate_links(notebook, path, node): - def walk(node): - if node.nodeType == node.ELEMENT_NODE and node.tagName == "a": url = node.getAttribute("href") if notebooklib.is_node_url(url): @@ -225,7 +203,6 @@ def walk(node): if url2 != "": node.setAttribute("href", url2) - # recurse for child in node.childNodes: walk(child) @@ -234,14 +211,13 @@ def walk(node): def write_index(notebook, node, path): - rootpath = node.get_path() index_file = os.path.join(path, "index.html") tree_file = os.path.join(path, "tree.html") - out = codecs.open(index_file, "wb", "utf-8") - #out = open(index_file, "wb") - out.write((u""" + # Write index.html + with safefile.safe_open(index_file, "w", codec="utf-8") as out: + out.write(""" %s @@ -251,13 +227,11 @@ def write_index(notebook, node, path): -""") % escape(node.get_title())) - out.close() +""" % escape(node.get_title())) - - # write tree file - out = codecs.open(tree_file, "wb", "utf-8") - out.write(u""" + # Write tree.html + with safefile.safe_open(tree_file, "w", codec="utf-8") as out: + out.write(""" @@ -274,13 +248,10 @@ def write_index(notebook, node, path): padding-left: 20px; display: none; - visibility: hidden; display: none; } - - a:active { text-decoration:none; @@ -308,12 +279,9 @@ def write_index(notebook, node, path): color: #500; font-weight: bold; } - - - """) - def walk(node): - - nodeid = node.get_attr("nodeid") - expand = node.get_attr("expanded", False) - - if len(node.get_children()) > 0: - out.write(u"""+ """ % - (nodeid, [u"false", u"true"][int(expand)])) - else: - out.write(u"  ") + def walk(node): + nodeid = node.get_attr("nodeid") + expand = node.get_attr("expanded", False) + if len(node.get_children()) > 0: + out.write("""+ """ % + (nodeid, ["false", "true"][int(expand)])) + else: + out.write("  ") - if node.get_attr("content_type") == notebooklib.CONTENT_TYPE_DIR: - out.write(u"%s
\n" % escape(node.get_title())) - else: - out.write(u"%s
\n" - % (nodeid2html_link(notebook, rootpath, nodeid), - escape(node.get_title()))) + if node.get_attr("content_type") == notebooklib.CONTENT_TYPE_DIR: + out.write("%s
\n" % escape(node.get_title())) + else: + out.write("%s
\n" + % (nodeid2html_link(notebook, rootpath, nodeid), + escape(node.get_title()))) - if len(node.get_children()) > 0: - out.write(u"
" % - (nodeid, [u"_collapsed", ""][int(expand)])) + if len(node.get_children()) > 0: + out.write("
" % + (nodeid, ["_collapsed", ""][int(expand)])) - for child in node.get_children(): - walk(child) + for child in node.get_children(): + walk(child) - out.write(u"
\n") - walk(node) + out.write("
\n") - out.write(u"""""") - out.close() + walk(node) + out.write("""""") def export_notebook(notebook, filename, task): @@ -407,54 +369,46 @@ def export_notebook(notebook, filename, task): # make sure all modifications are saved first try: notebook.save() - except Exception, e: + except Exception as e: raise NoteBookError("Could not save notebook before archiving", e) - # first count # of files nnodes = [0] + def walk(node): nnodes[0] += 1 for child in node.get_children(): walk(child) + walk(notebook) task.set_message(("text", "Exporting %d notes..." % nnodes[0])) nnodes2 = [0] - def export_page(node, path, arcname): - filename = os.path.join(path, "page.html") filename2 = os.path.join(arcname, "page.html") - + try: dom = minidom.parse(filename) - - except Exception, e: + except Exception as e: # error parsing file, use simple file export export_files(filename, filename2) - else: translate_links(notebook, path, dom.documentElement) - - # avoid writing header - # (provides compatiability with browsers) - out = codecs.open(filename2, "wb", "utf-8") - if dom.doctype: - dom.doctype.writexml(out) - dom.documentElement.writexml(out) - out.close() - + # Write the DOM to the output file in text mode with UTF-8 encoding + with safefile.safe_open(filename2, "w", codec="utf-8") as out: + if dom.doctype: + out.write(dom.doctype.toxml()) + out.write(dom.documentElement.toxml()) def export_node(node, path, arcname, index=False): - # look for aborted export if task.aborted(): raise NoteBookError("Backup canceled") - # report progresss + # report progress nnodes2[0] += 1 task.set_message(("detail", truncate_filename(path))) task.set_percent(nnodes2[0] / float(nnodes[0])) @@ -468,7 +422,6 @@ def export_node(node, path, arcname, index=False): if index: write_index(notebook, node, arcname) - if node.get_attr("content_type") == "text/xhtml+xml": skipfiles.add("page.html") # export xhtml @@ -491,12 +444,12 @@ def export_files(path, arcname): # look for aborted export if task.aborted(): raise NoteBookError("Backup canceled") - + if os.path.isfile(path): - # copy files + # copy files shutil.copy(path, arcname) - if os.path.isdir(path): + if os.path.isdir(path): # export directory os.mkdir(arcname) @@ -505,16 +458,11 @@ def export_files(path, arcname): if not os.path.islink(f): export_files(os.path.join(path, f), os.path.join(arcname, f)) - + export_node(notebook, notebook.get_path(), filename, True) task.set_message(("text", "Closing export...")) task.set_message(("detail", "")) - - if task: - task.finish() - - - - + if task: + task.finish() \ No newline at end of file diff --git a/keepnote/extensions/new_file/__init__.py b/keepnote/extensions/new_file/__init__.py index 7eb918ecf..5f8c7b768 100644 --- a/keepnote/extensions/new_file/__init__.py +++ b/keepnote/extensions/new_file/__init__.py @@ -1,29 +1,10 @@ """ - KeepNote Extension - new_file +KeepNote Extension +new_file - Extension allows adding new filetypes to a notebook +Extension allows adding new filetypes to a notebook """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - import gettext import os import re @@ -32,7 +13,6 @@ import time import xml.etree.cElementTree as etree - _ = gettext.gettext import keepnote @@ -44,25 +24,15 @@ from keepnote.gui import extension from keepnote.gui import dialog_app_options -# pygtk imports -try: - import pygtk - pygtk.require('2.0') - from gtk import gdk - import gtk.glade - import gobject -except ImportError: - # do not fail on gtk import error, - # extension should be usable for non-graphical uses - pass - +# PyGObject imports for GTK 4 +import gi +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, Gio +class Extension(extension.Extension): -class Extension (extension.Extension): - def __init__(self, app): """Initialize extension""" - extension.Extension.__init__(self, app) self.app = app @@ -71,27 +41,22 @@ def __init__(self, app): FileType("Text File (txt)", "untitled.txt", "plain_text.txt"), FileType("Spreadsheet (xls)", "untitled.xls", "spreadsheet.xls"), FileType("Word Document (doc)", "untitled.doc", "document.doc") - ] + ] self.enabled.add(self.on_enabled) - def get_filetypes(self): return self._file_types - def on_enabled(self, enabled): if enabled: self.load_config() - def get_depends(self): - return [("keepnote", ">=", (0, 7, 1))] - - + return [("keepnote.py", ">=", (0, 7, 1))] #=============================== - # config handling + # Config handling def get_config_file(self): return self.get_data_file("config.xml") @@ -103,21 +68,16 @@ def load_config(self): self.save_default_example_files() self.save_config() - - try: + try: tree = etree.ElementTree(file=config) - - # check root root = tree.getroot() if root.tag != "file_types": raise NoteBookError("Root tag is not 'file_types'") - # iterate children self._file_types = [] for child in root: if child.tag == "file_type": filetype = FileType("", "", "") - for child2 in child: if child2.tag == "name": filetype.name = child2.text @@ -125,21 +85,17 @@ def load_config(self): filetype.filename = child2.text elif child2.tag == "example_file": filetype.example_file = child2.text - self._file_types.append(filetype) - except: + except Exception: self.app.error("Error reading file type configuration") self.set_default_file_types() self.save_config() - def save_config(self): config = self.get_config_file() - - tree = etree.ElementTree( - etree.Element("file_types")) + tree = etree.ElementTree(etree.Element("file_types")) root = tree.getroot() for file_type in self._file_types: @@ -151,23 +107,20 @@ def save_config(self): filename = etree.SubElement(elm, "filename") filename.text = file_type.filename - tree.write(open(config, "w"), "UTF-8") - + # Write the XML file with proper encoding + with open(config, "wb") as f: + tree.write(f, encoding="utf-8", xml_declaration=True) def set_default_file_types(self): - self._file_types = list(self._default_file_types) def save_default_example_files(self): - base = self.get_base_dir() data_dir = self.get_data_dir() - for file_type in self._default_file_types: fn = file_type.example_file shutil.copy(os.path.join(base, fn), os.path.join(data_dir, fn)) - def update_all_menus(self): for window in self.get_windows(): self.set_new_file_menus(window) @@ -177,61 +130,55 @@ def update_all_menus(self): def on_add_ui(self, window): """Initialize extension for a particular window""" - - # add menu options - self.add_action(window, "New File", "New _File") - #("treeview_popup", None, None), - - self.add_ui(window, - """ - - - - - - - - - - - - - """) - + # Add "New File" action + action = Gio.SimpleAction.new("new-file", None) + action.connect("activate", lambda action, param: None) + window.add_action(action) + + # Add menu items using GMenu + app = window.get_application() + menu = app.get_menubar() + if not menu: + menu = Gio.Menu() + app.set_menubar(menu) + + file_menu = None + for i in range(menu.get_n_items()): + if menu.get_item_attribute_value(i, "label").get_string() == "_File": + file_menu = menu.get_item_link(i, "submenu") + break + + if not file_menu: + file_menu = Gio.Menu() + menu.append_submenu("_File", file_menu) + + new_menu = None + for i in range(file_menu.get_n_items()): + if file_menu.get_item_attribute_value(i, "label") == "New": + new_menu = file_menu.get_item_link(i, "submenu") + break + + if not new_menu: + new_menu = Gio.Menu() + file_menu.append_submenu("New", new_menu) + + new_menu.append("New _File", "win.new-file") self.set_new_file_menus(window) - #================================= # Options UI setup def on_add_options_ui(self, dialog): - - dialog.add_section(NewFileSection("new_file", - dialog, self._app, - self), - "extensions") - - + dialog.add_section(NewFileSection("new_file", dialog, self._app, self), "extensions") def on_remove_options_ui(self, dialog): - dialog.remove_section("new_file") - #====================================== - # callbacks + # Callbacks def on_new_file(self, window, file_type): - """Callback from gui to add a new file""" - + """Callback from GUI to add a new file""" notebook = window.get_notebook() if notebook is None: return @@ -252,87 +199,77 @@ def on_new_file(self, window, file_type): node = notebooklib.attach_file(uri, parent) node.rename(file_type.filename) window.get_viewer().goto_node(node) - except Exception, e: + except Exception as e: window.error("Error while attaching file '%s'." % uri, e) - def on_new_file_type(self, window): - """Callback from gui for adding a new file type""" + """Callback from GUI for adding a new file type""" self.app.app_options_dialog.show(window, "new_file") - - #========================================== - # menu setup + # Menu setup def set_new_file_menus(self, window): - """Set the recent notebooks in the file menu""" - - menu = window.get_uimanager().get_widget("/main_menu_bar/File/New/New File") - if menu: - self.set_new_file_menu(window, menu) + """Set the new file menus in the file menu""" + app = window.get_application() + menu = app.get_menubar() + if not menu: + return + file_menu = None + for i in range(menu.get_n_items()): + if menu.get_item_attribute_value(i, "label").get_string() == "_File": + file_menu = menu.get_item_link(i, "submenu") + break - menu = window.get_uimanager().get_widget("/popup_menus/treeview_popup/New/New File") - if menu: - self.set_new_file_menu(window, menu) + if not file_menu: + return + new_menu = None + for i in range(file_menu.get_n_items()): + if file_menu.get_item_attribute_value(i, "label") == "New": + new_menu = file_menu.get_item_link(i, "submenu") + break + + if new_menu: + for i in range(new_menu.get_n_items()): + if new_menu.get_item_attribute_value(i, "label").get_string() == "New _File": + submenu = Gio.Menu() + for file_type in self._file_types: + action_name = f"new-file-{file_type.name.lower().replace(' ', '-')}" + action = Gio.SimpleAction.new(action_name, None) + action.connect("activate", lambda action, param, ft=file_type: self.on_new_file(window, ft)) + window.add_action(action) + submenu.append(f"New {file_type.name}", f"win.{action_name}") + + submenu.append(None, None) # Separator + action = Gio.SimpleAction.new("add-new-file-type", None) + action.connect("activate", lambda action, param: self.on_new_file_type(window)) + window.add_action(action) + submenu.append("Add New File Type", "win.add-new-file-type") + + new_menu.remove(i) + new_menu.insert_submenu(i, "New _File", submenu) + break def set_new_file_menu(self, window, menu): - """Set the recent notebooks in the file menu""" - - # TODO: perform lookup of filetypes again - - # init menu - if menu.get_submenu() is None: - submenu = gtk.Menu() - submenu.show() - menu.set_submenu(submenu) - menu = menu.get_submenu() - - # clear menu - menu.foreach(lambda x: menu.remove(x)) - - def make_func(file_type): - return lambda w: self.on_new_file(window, file_type) - - # populate menu - for file_type in self._file_types: - item = gtk.MenuItem(u"New %s" % file_type.name) - item.connect("activate", make_func(file_type)) - item.show() - menu.append(item) - - item = gtk.SeparatorMenuItem() - item.show() - menu.append(item) - - item = gtk.MenuItem(u"Add New File Type") - item.connect("activate", lambda w: self.on_new_file_type(window)) - item.show() - menu.append(item) - - + """Set the new file submenu""" + pass # Handled in set_new_file_menus with GMenu #=============================== - # actions + # Actions def install_example_file(self, filename): """Installs a new example file into the extension""" - newpath = self.get_data_dir() newfilename = os.path.basename(filename) newfilename, ext = os.path.splitext(newfilename) - newfilename = notebooklib.get_unique_filename(newpath, newfilename, - ext=ext, sep=u"", - number=2) + newfilename = notebooklib.get_unique_filename(newpath, newfilename, ext=ext, sep="", number=2) shutil.copy(filename, newfilename) return os.path.basename(newfilename) - -class FileType (object): +class FileType(object): """Class containing information about a filetype""" - def __init__(self, name, filename, example_file): self.name = name self.filename = filename @@ -341,181 +278,119 @@ def __init__(self, name, filename, example_file): def copy(self): return FileType(self.name, self.filename, self.example_file) - - - -class NewFileSection (dialog_app_options.Section): - """A Section in the Options Dialog""" - - def __init__(self, key, dialog, app, ext, - label=u"New File Types", - icon=None): +class NewFileSection(dialog_app_options.Section): + def __init__(self, key, dialog, app, ext, label="New File Types", icon=None): dialog_app_options.Section.__init__(self, key, dialog, app, label, icon) - self.ext = ext self._filetypes = [] self._current_filetype = None - - # setup UI + # Setup UI w = self.get_default_widget() - h = gtk.HBox(False, 5) - w.add(h) + h = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5) + w.append(h) - # left column (file type list) - v = gtk.VBox(False, 5) - h.pack_start(v, False, True, 0) + # Left column (file type list) + v = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) + h.append(v) - self.filetype_store = gtk.ListStore(str, object) - self.filetype_listview = gtk.TreeView(self.filetype_store) + self.filetype_store = Gtk.ListStore.new([str, object]) + self.filetype_listview = Gtk.TreeView(model=self.filetype_store) self.filetype_listview.set_headers_visible(False) - self.filetype_listview.get_selection().connect("changed", - self.on_listview_select) + self.filetype_listview.get_selection().connect("changed", self.on_listview_select) - sw = gtk.ScrolledWindow() - sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - sw.set_shadow_type(gtk.SHADOW_IN) - sw.add(self.filetype_listview) + sw = Gtk.ScrolledWindow() + sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + sw.set_has_frame(True) + sw.set_child(self.filetype_listview) sw.set_size_request(160, 200) - v.pack_start(sw, False, True, 0) - + v.append(sw) - # create the treeview column - column = gtk.TreeViewColumn() + column = Gtk.TreeViewColumn() self.filetype_listview.append_column(column) - cell_text = gtk.CellRendererText() + cell_text = Gtk.CellRendererText() column.pack_start(cell_text, True) column.add_attribute(cell_text, 'text', 0) - # add/del buttons - h2 = gtk.HBox(False, 5) - v.pack_start(h2, False, True, 0) + # Add/del buttons + h2 = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5) + v.append(h2) - button = gtk.Button("New") + button = Gtk.Button(label="New") button.connect("clicked", self.on_new_filetype) - h2.pack_start(button, True, True, 0) + h2.append(button) - button = gtk.Button("Delete") + button = Gtk.Button(label="Delete") button.connect("clicked", self.on_delete_filetype) - h2.pack_start(button, True, True, 0) + h2.append(button) + # Right column (file type editor) + v = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) + h.append(v) - - - # right column (file type editor) - v = gtk.VBox(False, 5) - h.pack_start(v, False, True, 0) - - table = gtk.Table(3, 2) + table = Gtk.Grid() + table.set_row_spacing(5) + table.set_column_spacing(5) self.filetype_editor = table - v.pack_start(table, False, True, 0) - - - # file type name - label = gtk.Label("File type name:") - table.attach(label, 0, 1, 0, 1, - xoptions=0, yoptions=0, - xpadding=2, ypadding=2) - - self.filetype = gtk.Entry() - table.attach(self.filetype, 1, 2, 0, 1, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) - - - # default filename - label = gtk.Label("Default filename:") - table.attach(label, 0, 1, 1, 2, - xoptions=0, yoptions=0, - xpadding=2, ypadding=2) - - self.filename = gtk.Entry() - table.attach(self.filename, 1, 2, 1, 2, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) + v.append(table) + label = Gtk.Label(label="File type name:") + table.attach(label, 0, 0, 1, 1) - # example new file - label = gtk.Label("Example new file:") - table.attach(label, 0, 1, 2, 3, - xoptions=0, yoptions=0, - xpadding=2, ypadding=2) + self.filetype = Gtk.Entry() + table.attach(self.filetype, 1, 0, 1, 1) - self.example_file = gtk.Entry() - table.attach(self.example_file, 1, 2, 2, 3, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) - + label = Gtk.Label(label="Default filename:") + table.attach(label, 0, 1, 1, 1) - # browse button - button = gtk.Button(_("Browse...")) - button.set_image( - gtk.image_new_from_stock(gtk.STOCK_OPEN, - gtk.ICON_SIZE_SMALL_TOOLBAR)) - button.show() - button.connect("clicked", lambda w: - dialog_app_options.on_browse( - w.get_toplevel(), "Choose Example New File", "", - self.example_file)) - table.attach(button, 1, 2, 3, 4, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) + self.filename = Gtk.Entry() + table.attach(self.filename, 1, 1, 1, 1) + label = Gtk.Label(label="Example new file:") + table.attach(label, 0, 2, 1, 1) + self.example_file = Gtk.Entry() + table.attach(self.example_file, 1, 2, 1, 1) - w.show_all() - + button = Gtk.Button(label=_("Browse...")) + button.set_icon_name("document-open") + button.connect("clicked", lambda w: dialog_app_options.on_browse( + w.get_root(), "Choose Example New File", "", self.example_file)) + table.attach(button, 1, 3, 1, 1) self.set_filetypes() self.set_filetype_editor(None) - - - - def load_options(self, app): - """Load options from app to UI""" - self._filetypes = [x.copy() for x in self.ext.get_filetypes()] self.set_filetypes() self.filetype_listview.get_selection().unselect_all() - def save_options(self, app): - """Save options to the app""" - self.save_current_filetype() - - # install example files bad = [] for filetype in self._filetypes: if os.path.isabs(filetype.example_file): - # copy new file into extension data dir try: - filetype.example_file = self.ext.install_example_file( - filetype.example_file) - except Exception, e: - app.error("Cannot install example file '%s'" % - filetype.example_file, e) + filetype.example_file = self.ext.install_example_file(filetype.example_file) + except Exception as e: + app.error("Cannot install example file '%s'" % filetype.example_file, e) bad.append(filetype) - # update extension state - self.ext.get_filetypes()[:] = [x.copy() for x in self._filetypes - if x not in bad] + self.ext.get_filetypes()[:] = [x.copy() for x in self._filetypes if x not in bad] self.ext.save_config() self.ext.update_all_menus() - def set_filetypes(self): - """Initialize the lisview to the loaded filetypes""" - self.filetype_store.clear() - for filetype in self._filetypes: - self.filetype_store.append([filetype.name, filetype]) - + if self.filetype_store is not None: + self.filetype_store.clear() + for filetype in self._filetypes: + self.filetype_store.append([filetype.name, filetype]) + else: + self.filetype_store = Gtk.ListStore.new([str, object]) + self.filetype_listview.set_model(self.filetype_store) def set_filetype_editor(self, filetype): - """Update editor with current filetype""" - if filetype is None: self._current_filetype = None self.filetype.set_text("") @@ -528,51 +403,33 @@ def set_filetype_editor(self, filetype): self.filename.set_text(filetype.filename) self.example_file.set_text(filetype.example_file) self.filetype_editor.set_sensitive(True) - - def save_current_filetype(self): - """Save the contents of the editor into the current filetype object""" - if self._current_filetype: self._current_filetype.name = self.filetype.get_text() self._current_filetype.filename = self.filename.get_text() self._current_filetype.example_file = self.example_file.get_text() - - # update filetype list for row in self.filetype_store: if row[1] == self._current_filetype: row[0] = self._current_filetype.name - def on_listview_select(self, selection): - """Callback for when listview selection changes""" - model, it = self.filetype_listview.get_selection().get_selected() self.save_current_filetype() - - # set editor to current selection if it is not None: filetype = self.filetype_store[it][1] self.set_filetype_editor(filetype) else: self.set_filetype_editor(None) - def on_new_filetype(self, button): - """Callback for adding a new filetype""" - - self._filetypes.append(FileType(u"New File Type", u"untitled", "")) + self._filetypes.append(FileType("New File Type", "untitled", "")) self.set_filetypes() - self.filetype_listview.set_cursor((len(self._filetypes)-1,)) - + self.filetype_listview.set_cursor(len(self._filetypes)-1) def on_delete_filetype(self, button): - model, it = self.filetype_listview.get_selection().get_selected() if it is not None: filetype = self.filetype_store[it][1] self._filetypes.remove(filetype) - self.set_filetypes() - - + self.set_filetypes() \ No newline at end of file diff --git a/keepnote/extensions/notebook_http/__init__.py b/keepnote/extensions/notebook_http/__init__.py index 2d5750a53..f47f943c2 100644 --- a/keepnote/extensions/notebook_http/__init__.py +++ b/keepnote/extensions/notebook_http/__init__.py @@ -5,31 +5,12 @@ Command-line basic commands """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports import sys -import thread +import _thread -# keepnote imports +# keepnote.py imports import keepnote from keepnote import AppCommand import keepnote.notebook @@ -64,7 +45,7 @@ def __init__(self, app): def get_depends(self): - return [("keepnote", ">=", (0, 7, 6))] + return [("keepnote.py", ">=", (0, 7, 6))] def on_enabled(self, enabled): @@ -75,7 +56,7 @@ def on_enabled(self, enabled): continue try: self.app.add_command(command) - except Exception, e: + except Exception as e: self.app.error("Could not add command '%s'" % command.name, e, sys.exc_info()[2]) @@ -90,7 +71,7 @@ def on_enabled(self, enabled): def start_http(self, app, args): port = int(args[1]) - notebook_path = unicode(args[2]) + notebook_path = str(args[2]) # connect to notebook on disk conn = NoteBookConnectionFS() @@ -107,7 +88,7 @@ def start_http(self, app, args): self._ports[port] = server keepnote.log_message("starting server:\n%s\n" % url) - thread.start_new_thread(server.serve_forever, ()) + _thread.start_new_thread(server.serve_forever, ()) if host == "localhost": keepnote.log_message("NOTE: server is local only. Use ssh port forwarding for security.\n") diff --git a/keepnote/extensions/python_prompt/__init__.py b/keepnote/extensions/python_prompt/__init__.py index 7f468eb7b..66dc3dcc0 100644 --- a/keepnote/extensions/python_prompt/__init__.py +++ b/keepnote/extensions/python_prompt/__init__.py @@ -1,101 +1,80 @@ """ - KeepNote Python prompt extension - """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -# python imports +# Python imports import gettext import time import os import sys _ = gettext.gettext - -# keepnote imports +# KeepNote imports import keepnote from keepnote.gui import extension +from keepnote.gui import dialog_app_options +# PyGObject imports for GTK 4 +import gi +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, Gio -# pygtk imports -try: - import pygtk - pygtk.require('2.0') - import gtk - - from keepnote.gui import dialog_app_options - -except ImportError: - # do not fail on gtk import error, - # extension should be usable for non-graphical uses - pass - - +# Add the current directory to sys.path to import dialog_python sys.path.append(os.path.dirname(__file__)) -import dialog_python +from . import dialog_python -class Extension (extension.Extension): +class Extension(extension.Extension): def __init__(self, app): """Initialize extension""" - extension.Extension.__init__(self, app) - def get_depends(self): - return [("keepnote", ">=", (0, 7, 1))] + return [("keepnote.py", ">=", (0, 7, 1))] - #================================ # UI setup def on_add_ui(self, window): - - # add menu options - self.add_action(window, "Python Prompt...", "Python Prompt...", - lambda w: self.on_python_prompt(window)) - - self.add_ui(window, - """ - - - - - - - - - - """) - + # Add "Python Prompt" action + action = Gio.SimpleAction.new("python-prompt", None) + action.connect("activate", lambda action, param: self.on_python_prompt(window)) + window.add_action(action) + + # Add menu items using GMenu + app = window.get_application() + menu = app.get_menubar() + if not menu: + menu = Gio.Menu() + app.set_menubar(menu) + + tools_menu = None + for i in range(menu.get_n_items()): + if menu.get_item_attribute_value(i, "label").get_string() == "_Tools": + tools_menu = menu.get_item_link(i, "submenu") + break + + if not tools_menu: + tools_menu = Gio.Menu() + menu.append_submenu("_Tools", tools_menu) + + extensions_menu = None + for i in range(tools_menu.get_n_items()): + if tools_menu.get_item_attribute_value(i, "label") == "Extensions": + extensions_menu = tools_menu.get_item_link(i, "submenu") + break + + if not extensions_menu: + extensions_menu = Gio.Menu() + tools_menu.append_submenu("Extensions", extensions_menu) + + extensions_menu.append("Python Prompt...", "win.python-prompt") #================================ # actions - def on_python_prompt(self, window): - dialog = dialog_python.PythonDialog(window) - dialog.show() + dialog.show() \ No newline at end of file diff --git a/keepnote/extensions/python_prompt/dialog_python.py b/keepnote/extensions/python_prompt/dialog_python.py index 09d6640f6..37d468c3a 100644 --- a/keepnote/extensions/python_prompt/dialog_python.py +++ b/keepnote/extensions/python_prompt/dialog_python.py @@ -1,50 +1,16 @@ -""" - - KeepNote - Python Shell Dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports -import os import sys -import StringIO +import gi +gi.require_version('Gtk', '4.0') +# PyGObject imports +from gi.repository import Gtk, Gdk, Pango -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gtk.gdk -import pango - - -# keepnote imports +# KeepNote imports import keepnote from keepnote.gui import Action def move_to_start_of_line(it): - """Move a TextIter it to the start of a paragraph""" - + """Move a TextIter to the start of a paragraph""" if not it.starts_line(): if it.get_line() > 0: it.backward_line() @@ -53,14 +19,14 @@ def move_to_start_of_line(it): it = it.get_buffer().get_start_iter() return it + def move_to_end_of_line(it): - """Move a TextIter it to the start of a paragraph""" + """Move a TextIter to the start of a paragraph""" it.forward_line() return it -class Stream (object): - +class Stream: def __init__(self, callback): self._callback = callback @@ -71,10 +37,9 @@ def flush(self): pass +class PythonDialog: + """Python dialog for KeepNote using PyGObject (GTK 4)""" -class PythonDialog (object): - """Python dialog""" - def __init__(self, main_window): self.main_window = main_window self.app = main_window.get_app() @@ -82,168 +47,174 @@ def __init__(self, main_window): self.outfile = Stream(self.output_text) self.errfile = Stream(lambda t: self.output_text(t, "error")) - self.error_tag = gtk.TextTag() + # Create text tags for styling + self.error_tag = Gtk.TextTag.new("error") self.error_tag.set_property("foreground", "red") - self.error_tag.set_property("weight", pango.WEIGHT_BOLD) + self.error_tag.set_property("weight", Pango.Weight.BOLD) - self.info_tag = gtk.TextTag() + self.info_tag = Gtk.TextTag.new("info") self.info_tag.set_property("foreground", "blue") - self.info_tag.set_property("weight", pango.WEIGHT_BOLD) + self.info_tag.set_property("weight", Pango.Weight.BOLD) - def show(self): + # Setup environment + self.env = {"app": self.app, "window": self.main_window, "info": self.print_info} - # setup environment - self.env = {"app": self.app, - "window": self.main_window, - "info": self.print_info} - - # create dialog - self.dialog = gtk.Window(gtk.WINDOW_TOPLEVEL) - self.dialog.connect("delete-event", lambda d,r: self.dialog.destroy()) - self.dialog.ptr = self - + # Create dialog + self.dialog = Gtk.Window() + self.dialog.connect("close-request", lambda d: self.dialog.destroy()) self.dialog.set_default_size(400, 400) + self.dialog.ptr = self # Store reference (unchanged from original) - self.vpaned = gtk.VPaned() - self.dialog.add(self.vpaned) + # Vertical paned layout + self.vpaned = Gtk.Paned(orientation=Gtk.Orientation.VERTICAL) + self.dialog.set_child(self.vpaned) self.vpaned.set_position(200) - - # editor buffer - self.editor = gtk.TextView() - self.editor.connect("key-press-event", self.on_key_press_event) - f = pango.FontDescription("Courier New") - self.editor.modify_font(f) - sw = gtk.ScrolledWindow() - sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - sw.set_shadow_type(gtk.SHADOW_IN) - sw.add(self.editor) - self.vpaned.add1(sw) - - # output buffer - self.output = gtk.TextView() - self.output.set_wrap_mode(gtk.WRAP_WORD) - f = pango.FontDescription("Courier New") - self.output.modify_font(f) - sw = gtk.ScrolledWindow() - sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - sw.set_shadow_type(gtk.SHADOW_IN) - sw.add(self.output) - self.vpaned.add2(sw) - - self.output.get_buffer().tag_table.add(self.error_tag) - self.output.get_buffer().tag_table.add(self.info_tag) - - self.dialog.show_all() - + # Editor buffer + self.editor = Gtk.TextView() + self.editor.connect("key-press-event", self.on_key_press_event) + # Set font using CSS + css_provider = Gtk.CssProvider() + css_provider.load_from_data(""" + * { + font-family: "Courier New", monospace; + font-size: 10pt; + } + """.encode('utf-8')) + self.editor.add_css_class("monospace") + self.editor.get_style_context().add_provider(css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + + sw = Gtk.ScrolledWindow() + sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + sw.set_has_frame(True) + sw.set_child(self.editor) + self.vpaned.set_start_child(sw) + self.vpaned.set_resize_start_child(True) + + # Output buffer + self.output = Gtk.TextView() + self.output.set_wrap_mode(Gtk.WrapMode.WORD) + # Set font using CSS + css_provider = Gtk.CssProvider() + css_provider.load_from_data(""" + * { + font-family: "Courier New", monospace; + font-size: 10pt; + } + """.encode('utf-8')) + self.output.add_css_class("monospace") + self.output.get_style_context().add_provider(css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + + sw = Gtk.ScrolledWindow() + sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + sw.set_has_frame(True) + sw.set_child(self.output) + self.vpaned.set_end_child(sw) + self.vpaned.set_resize_end_child(True) + + # Add tags to output buffer's tag table + tag_table = self.output.get_buffer().get_tag_table() + tag_table.add(self.error_tag) + tag_table.add(self.info_tag) + + # Show dialog + self.dialog.present() self.output_text("Press Ctrl+Enter to execute. Ready...\n", "info") - def on_key_press_event(self, textview, event): - """Callback from key press event""" - - if (event.keyval == gtk.keysyms.Return and - event.state & gtk.gdk.CONTROL_MASK): - # execute + """Callback for key press events""" + keyval = event.get_keyval()[1] # GTK 4 returns a tuple (success, keyval) + state = event.get_state() + + if keyval == Gdk.KEY_Return and state & Gdk.ModifierType.CONTROL_MASK: + # Execute code on Ctrl+Enter self.execute_buffer() return True - if event.keyval == gtk.keysyms.Return: - # new line indenting + if keyval == Gdk.KEY_Return: + # New line indenting self.newline_indent() return True + return False def newline_indent(self): """Insert a newline and indent""" - buf = self.editor.get_buffer() - - it = buf.get_iter_at_mark(buf.get_insert()) - start = it.copy() - start = move_to_start_of_line(start) - line = start.get_text(it) - indent = [] - for c in line: - if c in " \t": - indent.append(c) - else: - break - buf.insert_at_cursor("\n" + "".join(indent)) - + insert_mark = buf.get_insert() + it = buf.get_iter_at_mark(insert_mark) + start = move_to_start_of_line(it.copy()) + line = buf.get_text(start, it, include_hidden_chars=False) + indent = "".join(c for c in line if c in " \t") + buf.insert_at_cursor("\n" + indent) def execute_buffer(self): """Execute code in buffer""" - buf = self.editor.get_buffer() - sel = buf.get_selection_bounds() - if len(sel) > 0: - # get selection + + if sel: start, end = sel self.output_text("executing selection:\n", "info") else: - # get all text start = buf.get_start_iter() end = buf.get_end_iter() self.output_text("executing buffer:\n", "info") - # get text in selection/buffer - text = start.get_text(end) - - # execute code + text = buf.get_text(start, end, include_hidden_chars=False) execute(text, self.env, self.outfile, self.errfile) - def output_text(self, text, mode="normal"): """Output text to output buffer""" - buf = self.output.get_buffer() - - # determine whether to follow - mark = buf.get_insert() - it = buf.get_iter_at_mark(mark) + insert_mark = buf.get_insert() + it = buf.get_iter_at_mark(insert_mark) follow = it.is_end() - # add output text + end_iter = buf.get_end_iter() if mode == "error": - buf.insert_with_tags(buf.get_end_iter(), text, self.error_tag) + buf.insert_with_tags(end_iter, text, self.error_tag) elif mode == "info": - buf.insert_with_tags(buf.get_end_iter(), text, self.info_tag) + buf.insert_with_tags(end_iter, text, self.info_tag) else: - buf.insert(buf.get_end_iter(), text) - + buf.insert(end_iter, text) + if follow: buf.place_cursor(buf.get_end_iter()) - self.output.scroll_mark_onscreen(mark) - + self.output.scroll_to_mark(insert_mark, 0.0, True, 0.0, 1.0) def print_info(self): - - print "COMMON INFORMATION" - print "==================" - print - + """Print runtime information""" + print("COMMON INFORMATION") + print("==================") + print() keepnote.print_runtime_info(sys.stdout) - - print "Open notebooks" - print "--------------" - print "\n".join(n.get_path() for n in self.app.iter_notebooks()) - + print("Open notebooks") + print("--------------") + print("\n".join(n.get_path() for n in self.app.iter_notebooks())) def execute(code, vars, stdout, stderr): - """Execute user's python code""" - + """Execute user's Python code""" __stdout = sys.stdout __stderr = sys.stderr sys.stdout = stdout sys.stderr = stderr try: exec(code, vars) - except Exception, e: + except Exception as e: keepnote.log_error(e, sys.exc_info()[2], stderr) sys.stdout = __stdout sys.stderr = __stderr + +# Ensure this file can be imported as an extension +if __name__ == "__main__": + # Example usage (not typically run standalone) + from keepnote.gui import KeepNote + app = KeepNote() + win = app.new_window() + dialog = PythonDialog(win) + dialog.show() + app.run() \ No newline at end of file diff --git a/keepnote/gui/__init__.py b/keepnote/gui/__init__.py index eb8e45580..6425ae3ad 100644 --- a/keepnote/gui/__init__.py +++ b/keepnote/gui/__init__.py @@ -1,76 +1,60 @@ """ - KeepNote Graphical User Interface for KeepNote Application - """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python imports import os import sys import threading -# pygtk imports -import pygtk -pygtk.require('2.0') -from gtk import gdk -import gtk.glade -import gobject -# keepnote imports + +from keepnote.sqlitedict import logger +import gi +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, GLib, Gdk, GdkPixbuf +from gi.repository import Gio +# KeepNote imports import keepnote -from keepnote import log_error -import keepnote.gui.richtext.richtext_tags -from keepnote import get_resource, unicode_gtk + +from keepnote.gui.richtext import richtext_tags +from keepnote.util.platform import get_resource from keepnote import tasklib from keepnote.notebook import NoteBookError import keepnote.notebook as notebooklib import keepnote.gui.dialog_app_options import keepnote.gui.dialog_node_icon import keepnote.gui.dialog_wait -from keepnote.gui.icons import \ - DEFAULT_QUICK_PICK_ICONS, uncache_node_icon - -_ = keepnote.translate +from keepnote.gui.icons import DEFAULT_QUICK_PICK_ICONS, uncache_node_icon -#============================================================================= -# constants +# 修改为从 util.perform 直接导入 +from keepnote.util.platform import translate +_ = translate +# Constants MAX_RECENT_NOTEBOOKS = 20 -ACCEL_FILE = u"accel.txt" -IMAGE_DIR = u"images" +ACCEL_FILE = "accel.txt" +IMAGE_DIR = "images" CONTEXT_MENU_ACCEL_PATH = "
/context_menu" DEFAULT_AUTOSAVE_TIME = 10 * 1000 # 10 sec (in msec) -# font constants +# Font constants DEFAULT_FONT_FAMILY = "Sans" DEFAULT_FONT_SIZE = 10 -DEFAULT_FONT = "%s %d" % (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE) +DEFAULT_FONT = f"{DEFAULT_FONT_FAMILY} {DEFAULT_FONT_SIZE}" + +from keepnote.util.platform import get_platform -if keepnote.get_platform() == "darwin": - CLIPBOARD_NAME = gdk.SELECTION_PRIMARY -else: - CLIPBOARD_NAME = "CLIPBOARD" + +try: + # GTK3 的方式 + CLIPBOARD_NAME = Gdk.SELECTION_PRIMARY + clipboard = Gtk.Clipboard.get(CLIPBOARD_NAME) +except AttributeError: + # GTK4 的方式 + clipboard = Gdk.Display.get_default().get_clipboard() DEFAULT_COLORS_FLOAT = [ # lights @@ -81,7 +65,6 @@ (.6, 1, 1), (.6, .6, 1), (1, .6, 1), - # trues (1, 0, 0), (1, .64, 0), @@ -90,7 +73,6 @@ (0, 1, 1), (0, 0, 1), (1, 0, 1), - # darks (.5, 0, 0), (.5, .32, 0), @@ -99,7 +81,6 @@ (0, .5, .5), (0, 0, .5), (.5, 0, .5), - # white, gray, black (1, 1, 1), (.9, .9, .9), @@ -110,48 +91,37 @@ (0, 0, 0), ] - def color_float_to_int8(color): - return (int(255*color[0]), int(255*color[1]), int(255*color[2])) - + return (int(255 * color[0]), int(255 * color[1]), int(255 * color[2])) def color_int8_to_str(color): - return "#%02x%02x%02x" % (color[0], color[1], color[2]) + return f"#{color[0]:02x}{color[1]:02x}{color[2]:02x}" DEFAULT_COLORS = [color_int8_to_str(color_float_to_int8(color)) for color in DEFAULT_COLORS_FLOAT] - -#============================================================================= -# resources - -class PixbufCache (object): +# Resources +class PixbufCache(object): """A cache for loading pixbufs from the filesystem""" - def __init__(self): self._pixbufs = {} def get_pixbuf(self, filename, size=None, key=None): - """ - Get pixbuf from a filename - Cache pixbuf for later use - """ - if key is None: key = (filename, size) if key in self._pixbufs: return self._pixbufs[key] else: - # may raise GError - pixbuf = gtk.gdk.pixbuf_new_from_file(filename) + if not isinstance(filename, str): + # 不接受 Gtk.Image 或 Paintable，返回默认或跳过 + return None - # resize + pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename) if size: if size != (pixbuf.get_width(), pixbuf.get_height()): pixbuf = pixbuf.scale_simple(size[0], size[1], - gtk.gdk.INTERP_BILINEAR) - + GdkPixbuf.InterpType.BILINEAR) self._pixbufs[key] = pixbuf return pixbuf @@ -161,402 +131,253 @@ def cache_pixbuf(self, pixbuf, key): def is_pixbuf_cached(self, key): return key in self._pixbufs - -# singleton +# Singleton pixbufs = PixbufCache() - get_pixbuf = pixbufs.get_pixbuf cache_pixbuf = pixbufs.cache_pixbuf is_pixbuf_cached = pixbufs.is_pixbuf_cached - def get_resource_image(*path_list): - """Returns gtk.Image from resource path""" + """Returns Gtk.Image from resource path""" filename = get_resource(IMAGE_DIR, *path_list) - img = gtk.Image() - img.set_from_file(filename) - return img - + return Gtk.Image.new_from_file(filename) def get_resource_pixbuf(*path_list, **options): """Returns cached pixbuf from resource path""" - # raises GError return pixbufs.get_pixbuf(get_resource(IMAGE_DIR, *path_list), **options) - def fade_pixbuf(pixbuf, alpha=128): - """Returns a new faded a pixbuf""" + """Returns a new faded pixbuf""" width, height = pixbuf.get_width(), pixbuf.get_height() - pixbuf2 = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, width, height) - pixbuf2.fill(0xffffff00) # fill with transparent + pixbuf2 = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, width, height) + pixbuf2.fill(0xffffff00) # Fill with transparent pixbuf.composite(pixbuf2, 0, 0, width, height, - 0, 0, 1.0, 1.0, gtk.gdk.INTERP_NEAREST, alpha) - #pixbuf.composite_color(pixbuf2, 0, 0, width, height, - # 0, 0, 1.0, 1.0, gtk.gdk.INTERP_NEAREST, alpha, - # 0, 0, 1, 0xcccccc, 0x00000000) + 0, 0, 1.0, 1.0, GdkPixbuf.InterpType.NEAREST, alpha) return pixbuf2 - -#============================================================================= -# misc. gui functions - +# Misc GUI functions def get_accel_file(): """Returns gtk accel file""" - return os.path.join(keepnote.get_user_pref_dir(), ACCEL_FILE) - def init_key_shortcuts(): """Setup key shortcuts for the window""" accel_file = get_accel_file() if os.path.exists(accel_file): - gtk.accel_map_load(accel_file) + Gtk.accelerator_parse_from_file(accel_file) # GTK 4 doesn't have AccelMap else: - gtk.accel_map_save(accel_file) - + pass # No direct equivalent in GTK 4 for saving accel map def set_gtk_style(font_size=10, vsep=0): + """Set basic GTK style settings using CSS""" + css_provider = Gtk.CssProvider() + css = f""" + * {{ + font-family: {DEFAULT_FONT_FAMILY}; + font-size: {font_size}px; + }} """ - Set basic GTK style settings - """ - gtk.rc_parse_string(""" - style "keepnote-treeview" { - font_name = "%(font_size)d" - GtkTreeView::vertical-separator = %(vsep)d - GtkTreeView::expander-size = 10 - } - - class "GtkTreeView" style "keepnote-treeview" - class "GtkEntry" style "keepnote-treeview" - - """ % {"font_size": font_size, - "vsep": vsep}) - + css_provider.load_from_data(css.encode('utf-8')) + display = Gdk.Display.get_default() + Gtk.StyleContext.add_provider_for_display( + display, + css_provider, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + ) def update_file_preview(file_chooser, preview): """Preview widget for file choosers""" - - filename = file_chooser.get_preview_filename() + filename = file_chooser.get_filename() try: - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(filename, 128, 128) - preview.set_from_pixbuf(pixbuf) - have_preview = True - except: - have_preview = False - file_chooser.set_preview_widget_active(have_preview) - - -class FileChooserDialog (gtk.FileChooserDialog): - """File Chooser Dialog with a persistent path""" - - def __init__(self, title=None, parent=None, - action=gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=None, backend=None, - app=None, - persistent_path=None): - gtk.FileChooserDialog.__init__(self, title, parent, - action, buttons, backend) + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(filename, 128, 128) + preview.set_pixbuf(pixbuf) + file_chooser.set_preview_widget_active(True) + except GLib.GError: + file_chooser.set_preview_widget_active(False) + +class FileChooserDialog(Gtk.FileChooserDialog): + def __init__(self, title, parent, action, buttons, app=None, persistent_path=None): + super().__init__( + title=title, + transient_for=parent, + action=action + ) + for label, response in buttons: + self.add_button(label, response) self._app = app self._persistent_path = persistent_path - if self._app and self._persistent_path: - path = self._app.get_default_path(self._persistent_path) - if path and os.path.exists(path): - self.set_current_folder(path) - def run(self): - response = gtk.FileChooserDialog.run(self) - - if (response == gtk.RESPONSE_OK and - self._app and self._persistent_path): - self._app.set_default_path( - self._persistent_path, unicode_gtk(self.get_current_folder())) - + response = self.show() return response + def get_filename(self): + return super().get_filename() -#============================================================================= -# menu actions - -class UIManager (gtk.UIManager): - """Specialization of UIManager for use in KeepNote""" - +# Menu actions (GTK 4 uses Gio.SimpleAction instead of Gtk.Action) +class UIManager: + """Custom UIManager replacement for GTK 4""" def __init__(self, force_stock=False): - gtk.UIManager.__init__(self) - self.connect("connect-proxy", self._on_connect_proxy) - self.connect("disconnect-proxy", self._on_disconnect_proxy) - + self.action_groups = [] self.force_stock = force_stock - self.c = gtk.VBox() - - def _on_connect_proxy(self, uimanager, action, widget): - """Callback for a widget entering management""" - if isinstance(action, (Action, ToggleAction)) and action.icon: - self.set_icon(widget, action) - - def _on_disconnect_proxy(self, uimanager, action, widget): - """Callback for a widget leaving management""" - pass + def insert_action_group(self, action_group, pos=-1): + if action_group.get_name() not in [ag.get_name() for ag in self.action_groups]: + if pos == -1: + self.action_groups.append(action_group) + else: + self.action_groups.insert(pos, action_group) def set_force_stock(self, force): - """Sets the 'force stock icon' option""" self.force_stock = force - for ag in self.get_action_groups(): - for action in ag.list_actions(): - for widget in action.get_proxies(): - self.set_icon(widget, action) - - def set_icon(self, widget, action): - """Sets the icon for a managed widget""" + def get_action_groups(self): + return self.action_groups - # do not handle actions that are not of our custom classes - if not isinstance(action, (Action, ToggleAction)): - return - - if isinstance(widget, gtk.ImageMenuItem): - if self.force_stock and action.get_property("stock-id"): - img = gtk.Image() - img.set_from_stock(action.get_property("stock-id"), - gtk.ICON_SIZE_MENU) - img.show() - widget.set_image(img) - - elif action.icon: - img = gtk.Image() - img.set_from_pixbuf(get_resource_pixbuf(action.icon)) - img.show() - widget.set_image(img) - - elif isinstance(widget, gtk.ToolButton): - if self.force_stock and action.get_property("stock-id"): - w = widget.get_icon_widget() - if w: - w.set_from_stock(action.get_property("stock-id"), - gtk.ICON_SIZE_MENU) - - elif action.icon: - w = widget.get_icon_widget() - if w: - w.set_from_pixbuf(get_resource_pixbuf(action.icon)) - else: - img = gtk.Image() - img.set_from_pixbuf(get_resource_pixbuf(action.icon)) - img.show() - widget.set_icon_widget(img) - - -class Action (gtk.Action): +class Action(Gio.SimpleAction): def __init__(self, name, stockid=None, label=None, - accel="", tooltip="", func=None, - icon=None): - gtk.Action.__init__(self, name, label, tooltip, stockid) + accel="", tooltip="", func=None, icon=None): + super().__init__(name=name) self.func = func self.accel = accel self.icon = icon - self.signal = None - + self.label = label + self.tooltip = tooltip if func: - self.signal = self.connect("activate", func) - + self.connect("activate", lambda action, param: func(action)) -class ToggleAction (gtk.ToggleAction): - def __init__(self, name, stockid, label=None, +class ToggleAction(Gio.SimpleAction): + def __init__(self, name, stockid=None, label=None, accel="", tooltip="", func=None, icon=None): - gtk.ToggleAction.__init__(self, name, label, tooltip, stockid) + super().__init__(name=name, state=GLib.Variant.new_boolean(False)) self.func = func self.accel = accel self.icon = icon - self.signal = None - + self.label = label + self.tooltip = tooltip if func: - self.signal = self.connect("toggled", func) - + self.connect("activate", lambda action, param: func(action)) def add_actions(actiongroup, actions): - """Add a list of Action's to an gtk.ActionGroup""" - for action in actions: - actiongroup.add_action_with_accel(action, action.accel) - + actiongroup.add_action(action) -#============================================================================= # Application for GUI +class KeepNote(keepnote.KeepNote): + def get_node(self, node_id): + print(">>> get_node() called") + notebook = self.get_notebook() + if notebook: + return notebook.get_node_by_id(node_id) + return None -# TODO: implement 'close all' for notebook -# requires listening for close. - - -class KeepNote (keepnote.KeepNote): """GUI version of the KeepNote application instance""" - def __init__(self, basedir=None): - keepnote.KeepNote.__init__(self, basedir) - - # window management + super().__init__(basedir) self._current_window = None self._windows = [] - - # shared gui resources - self._tag_table = ( - keepnote.gui.richtext.richtext_tags.RichTextTagTable()) + self._tag_table = richtext_tags.RichTextTagTable() self.init_dialogs() - - # auto save - self._auto_saving = False # True if autosave is on - self._auto_save_registered = False # True if autosave is registered - self._auto_save_pause = 0 # >0 if autosave is paused + self._auto_saving = False + self._auto_save_registered = False + self._auto_save_pause = 0 def init(self): - """Initialize application from disk""" - keepnote.KeepNote.init(self) + super().init() def init_dialogs(self): - self.app_options_dialog = ( - keepnote.gui.dialog_app_options.ApplicationOptionsDialog(self)) - self.node_icon_dialog = ( - keepnote.gui.dialog_node_icon.NodeIconDialog(self)) + self.app_options_dialog = keepnote.gui.dialog_app_options.ApplicationOptionsDialog(self) + self.node_icon_dialog = keepnote.gui.dialog_node_icon.NodeIconDialog(self) def set_lang(self): - """Set language for application""" - keepnote.KeepNote.set_lang(self) - - # setup glade with gettext - import gtk.glade - gtk.glade.bindtextdomain(keepnote.GETTEXT_DOMAIN, - keepnote.get_locale_dir()) - gtk.glade.textdomain(keepnote.GETTEXT_DOMAIN) + super().set_lang() - # re-initialize dialogs - self.init_dialogs() + def parse_window_size(self, size_str): + try: + if not isinstance(size_str, str): + return (1024, 600) + size_str = size_str.strip("()") + width, height = map(int, size_str.split(",")) + return (width, height) + except (ValueError, AttributeError): + print("Failed to parse window_size, using default (1024, 600)") + return (1024, 600) def load_preferences(self): - """Load information from preferences""" - keepnote.KeepNote.load_preferences(self) - - # set defaults for auto save + super().load_preferences() p = self.pref p.get("autosave_time", default=DEFAULT_AUTOSAVE_TIME) - - # set style - set_gtk_style(font_size=p.get("look_and_feel", "app_font_size", - default=10)) - - # let windows load their preferences + set_gtk_style(font_size=p.get("look_and_feel", "app_font_size", default=10)) for window in self._windows: window.load_preferences() - - for notebook in self._notebooks.itervalues(): - notebook.enable_fulltext_search(p.get("use_fulltext_search", - default=True)) - - # start autosave loop, if requested + for notebook in self._notebooks.values(): + notebook.enable_fulltext_search(p.get("use_fulltext_search", default=True)) self.begin_auto_save() def save_preferences(self): - """Save information into preferences""" - - # let windows save their preferences for window in self._windows: window.save_preferences() - - keepnote.KeepNote.save_preferences(self) - - #================================= - # GUI + super().save_preferences() def get_richtext_tag_table(self): - """Returns the application-wide richtext tag table""" return self._tag_table def new_window(self): - """Create a new main window""" import keepnote.gui.main_window - window = keepnote.gui.main_window.KeepNoteWindow(self) - window.connect("delete-event", self._on_window_close) + window.connect("close-request", self._on_window_close) window.connect("focus-in-event", self._on_window_focus) self._windows.append(window) - self.init_extensions_windows([window]) - window.show_all() - + window.show() if self._current_window is None: self._current_window = window - return window def get_current_window(self): - """Returns the currenly active window""" return self._current_window def get_windows(self): - """Returns a list of open windows""" return self._windows def open_notebook(self, filename, window=None, task=None): - """Open notebook""" from keepnote.gui import dialog_update_notebook - - # HACK - if isinstance(self._conns.get(filename), - keepnote.notebook.connection.fs.NoteBookConnectionFS): - + if isinstance(self._conns.get(filename), keepnote.notebook.connection.fs.NoteBookConnectionFS): try: version = notebooklib.get_notebook_version(filename) - except Exception, e: - self.error(_("Could not load notebook '%s'.") % filename, - e, sys.exc_info()[2]) + except Exception as e: + self.error(f"Could not load notebook test '{filename}'.", e, sys.exc_info()[2]) return None - if version < notebooklib.NOTEBOOK_FORMAT_VERSION: - dialog = dialog_update_notebook.UpdateNoteBookDialog( - self, window) + dialog = dialog_update_notebook.UpdateNoteBookDialog(self, window) if not dialog.show(filename, version=version, task=task): - self.error(_("Cannot open notebook (version too old)")) - gtk.gdk.threads_leave() + self.error("Cannot open notebook (version too old)") return None - # load notebook in background def update(task): sem = threading.Semaphore() sem.acquire() - - # perform notebook load in gui thread. - # Ideally, this should be in the background, but it is very - # slow. If updating the wait dialog wasn't so expensive, I would - # simply do loading in the background thread. def func(): try: conn = self._conns.get(filename) notebook = notebooklib.NoteBook() notebook.load(filename, conn) task.set_result(notebook) - except Exception: - task.set_exc_info() + except Exception as e: + task.set_exc_info(sys.exc_info()) task.stop() - sem.release() # notify that notebook is loaded + finally: + sem.release() return False - - gobject.idle_add(func) - - # wait for notebook to load + GLib.idle_add(func) sem.acquire() - def update_old(task): - notebook = notebooklib.NoteBook() - notebook.load(filename) - task.set_result(notebook) - task = tasklib.Task(update) dialog = keepnote.gui.dialog_wait.WaitDialog(window) dialog.show(_("Opening notebook"), _("Loading..."), task, cancel=False) - - # detect errors try: if task.aborted(): raise task.exc_info()[1] @@ -564,95 +385,57 @@ def update_old(task): notebook = task.get_result() if notebook is None: return None - - except notebooklib.NoteBookVersionError, e: - self.error(_("This version of %s cannot read this notebook.\n" - "The notebook has version %d. %s can only read %d.") - % (keepnote.PROGRAM_NAME, - e.notebook_version, - keepnote.PROGRAM_NAME, - e.readable_version), + except notebooklib.NoteBookVersionError as e: + self.error(f"This version of {keepnote.PROGRAM_NAME} cannot read this notebook.\n" + f"The notebook has version {e.notebook_version}. {keepnote.PROGRAM_NAME} can only read {e.readable_version}.", e, task.exc_info()[2]) return None - - except NoteBookError, e: - self.error(_("Could not load notebook '%s'.") % filename, - e, task.exc_info()[2]) + except NoteBookError as e: + self.error(f"Could not load notebook first'{filename}'.", e, task.exc_info()[2]) return None - - except Exception, e: - # give up opening notebook - self.error(_("Could not load notebook '%s'.") % filename, - e, task.exc_info()[2]) + except Exception as e: + logger.error(f"没有发现这个文件的名字{filename}") return None - self._init_notebook(notebook) - return notebook def _init_notebook(self, notebook): - write_needed = False - - # install default quick pick icons if len(notebook.pref.get_quick_pick_icons()) == 0: - notebook.pref.set_quick_pick_icons( - list(DEFAULT_QUICK_PICK_ICONS)) + notebook.pref.set_quick_pick_icons(list(DEFAULT_QUICK_PICK_ICONS)) notebook.set_preferences_dirty() write_needed = True - - # install default quick pick icons if len(notebook.pref.get("colors", default=())) == 0: notebook.pref.set("colors", DEFAULT_COLORS) notebook.set_preferences_dirty() write_needed = True - - notebook.enable_fulltext_search(self.pref.get("use_fulltext_search", - default=True)) - - # TODO: use listeners to invoke saving + notebook.enable_fulltext_search(self.pref.get("use_fulltext_search", default=True)) if write_needed: notebook.write_preferences() def save_notebooks(self, silent=False): - """Save all opened notebooks""" - - # clear all window and viewer info in notebooks - for notebook in self._notebooks.itervalues(): + for notebook in self._notebooks.values(): notebook.pref.clear("windows", "ids") notebook.pref.clear("viewers", "ids") - - # save all the windows for window in self._windows: window.save_notebook(silent=silent) - - # save all the notebooks - for notebook in self._notebooks.itervalues(): + for notebook in self._notebooks.values(): notebook.save() - - # let windows know about completed save for window in self._windows: window.update_title() def _on_closing_notebook(self, notebook, save): - """ - Callback for when notebook is about to close - """ - keepnote.KeepNote._on_closing_notebook(self, notebook, save) - + from keepnote import log_error + super()._on_closing_notebook(notebook, save) try: if save: self.save() - except: - keepnote.log_error("Error while closing notebook") - + except Exception as e: + log_error("Error while closing notebook", e) for window in self._windows: window.close_notebook(notebook) def goto_nodeid(self, nodeid): - """ - Open a node by nodeid - """ for window in self.get_windows(): notebook = window.get_notebook() if not notebook: @@ -662,344 +445,211 @@ def goto_nodeid(self, nodeid): window.get_viewer().goto_node(node) break - #===================================== - # auto-save - def begin_auto_save(self): - """Begin autosave callbacks""" - if self.pref.get("autosave"): self._auto_saving = True - if not self._auto_save_registered: self._auto_save_registered = True - gobject.timeout_add(self.pref.get("autosave_time"), - self.auto_save) + autosave_time = int(self.pref.get("autosave_time", default=DEFAULT_AUTOSAVE_TIME)) + GLib.timeout_add(autosave_time, self.auto_save) else: self._auto_saving = False def end_auto_save(self): - """Stop autosave""" self._auto_saving = False def auto_save(self): - """Callback for autosaving""" - self._auto_saving = self.pref.get("autosave") - - # NOTE: return True to activate next timeout callback if not self._auto_saving: self._auto_save_registered = False return False - - # don't do autosave if it is paused if self._auto_save_pause > 0: return True - self.save(True) - return True def pause_auto_save(self, pause): - """Pauses autosaving""" self._auto_save_pause += 1 if pause else -1 - #=========================================== - # node icons - def on_set_icon(self, icon_file, icon_open_file, nodes): - """ - Change the icon for a node - - icon_file, icon_open_file -- icon basenames - use "" to delete icon setting (set default) - use None to leave icon setting unchanged - """ - - # TODO: maybe this belongs inside the node_icon_dialog? - for node in nodes: - if icon_file == u"": + if icon_file == "": node.del_attr("icon") elif icon_file is not None: node.set_attr("icon", icon_file) - - if icon_open_file == u"": + if icon_open_file == "": node.del_attr("icon_open") elif icon_open_file is not None: node.set_attr("icon_open", icon_open_file) - - # uncache pixbufs uncache_node_icon(node) def on_new_icon(self, nodes, notebook, window=None): - """Change the icon for a node""" - - # TODO: maybe this belongs inside the node_icon_dialog? - if notebook is None: return - - # TODO: assume only one node is selected node = nodes[0] - - icon_file, icon_open_file = self.node_icon_dialog.show(node, - window=window) - + icon_file, icon_open_file = self.node_icon_dialog.show(node, window=window) newly_installed = set() - - # NOTE: files may be filename or basename, use isabs to distinguish - if icon_file and os.path.isabs(icon_file) and \ - icon_open_file and os.path.isabs(icon_open_file): - icon_file, icon_open_file = notebook.install_icons( - icon_file, icon_open_file) + if icon_file and os.path.isabs(icon_file) and icon_open_file and os.path.isabs(icon_open_file): + icon_file, icon_open_file = notebook.install_icons(icon_file, icon_open_file) newly_installed.add(os.path.basename(icon_file)) newly_installed.add(os.path.basename(icon_open_file)) - else: if icon_file and os.path.isabs(icon_file): icon_file = notebook.install_icon(icon_file) newly_installed.add(os.path.basename(icon_file)) - if icon_open_file and os.path.isabs(icon_open_file): icon_open_file = notebook.install_icon(icon_open_file) newly_installed.add(os.path.basename(icon_open_file)) - - # set quick picks if OK was pressed if icon_file is not None: - notebook.pref.set_quick_pick_icons( - self.node_icon_dialog.get_quick_pick_icons()) - - # TODO: figure out whether I need to track newly installed or not. - # set notebook icons + notebook.pref.set_quick_pick_icons(self.node_icon_dialog.get_quick_pick_icons()) notebook_icons = notebook.get_icons() - keep_set = (set(self.node_icon_dialog.get_notebook_icons()) | - newly_installed) + keep_set = (set(self.node_icon_dialog.get_notebook_icons()) | newly_installed) for icon in notebook_icons: if icon not in keep_set: notebook.uninstall_icon(icon) - notebook.set_preferences_dirty() - - # TODO: should this be done with a notify? notebook.write_preferences() - self.on_set_icon(icon_file, icon_open_file, nodes) - #================================== - # file attachment - def on_attach_file(self, node=None, parent_window=None): - dialog = FileChooserDialog( - _("Attach File..."), parent_window, - action=gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("Attach"), gtk.RESPONSE_OK), + title=_("Attach File..."), + parent=parent_window, + action=Gtk.FileChooserAction.OPEN, + buttons=[ + (_("Cancel"), Gtk.ResponseType.CANCEL), + (_("Attach"), Gtk.ResponseType.OK) + ], app=self, - persistent_path="attach_file_path") - dialog.set_default_response(gtk.RESPONSE_OK) + persistent_path="attach_file_path" + ) dialog.set_select_multiple(True) - - # setup preview - preview = gtk.Image() + preview = Gtk.Image() dialog.set_preview_widget(preview) dialog.connect("update-preview", update_file_preview, preview) - response = dialog.run() - - if response == gtk.RESPONSE_OK: - if len(dialog.get_filenames()) > 0: - filenames = map(unicode_gtk, dialog.get_filenames()) - self.attach_files(filenames, node, - parent_window=parent_window) - + if response == Gtk.ResponseType.OK: + filenames = list(dialog.get_filenames()) + self.attach_files(filenames, node, parent_window=parent_window) dialog.destroy() - def attach_file(self, filename, parent, index=None, - parent_window=None): + def attach_file(self, filename, parent, index=None, parent_window=None): self.attach_files([filename], parent, index, parent_window) - def attach_files(self, filenames, parent, index=None, - parent_window=None): - + def attach_files(self, filenames, parent, index=None, parent_window=None): if parent_window is None: parent_window = self.get_current_window() - - #def func(task): - # for filename in filenames: - # task.set_message(("detail", _("attaching %s") % - # os.path.basename(filename))) - # notebooklib.attach_file(filename, parent, index) - # if not task.is_running(): - # task.abort() - #task = tasklib.Task(func) - try: for filename in filenames: notebooklib.attach_file(filename, parent, index) - - #dialog = keepnote.gui.dialog_wait.WaitDialog(parent_window) - #dialog.show(_("Attach File"), _("Attaching files to notebook."), - # task, cancel=False) - - #if task.aborted(): - # raise task.exc_info()[1] - - except Exception, e: + except Exception as e: if len(filenames) > 1: - self.error(_("Error while attaching files %s." % - ", ".join(["'%s'" % f for f in filenames])), - e, sys.exc_info()[2]) + self.error(f"Error while attaching files {', '.join([f'{f}' for f in filenames])}.", e, sys.exc_info()[2]) else: - self.error( - _("Error while attaching file '%s'." % filenames[0]), - e, sys.exc_info()[2]) - - #================================== - # misc GUI + self.error(f"Error while attaching file '{filenames[0]}'.", e, sys.exc_info()[2]) def focus_windows(self): - """Focus all open windows on desktop""" for window in self._windows: - window.restore_window() + window.present() def error(self, text, error=None, tracebk=None, parent=None): - """Display an error message""" - + from keepnote import log_error if parent is None: parent = self.get_current_window() - - dialog = gtk.MessageDialog( - parent, - flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - type=gtk.MESSAGE_ERROR, - buttons=gtk.BUTTONS_OK, - message_format=text) + dialog = Gtk.MessageDialog( + transient_for=parent, + modal=True, + destroy_with_parent=True, + message_type=Gtk.MessageType.ERROR, + buttons=Gtk.ButtonsType.OK, + text=text + ) dialog.connect("response", lambda d, r: d.destroy()) dialog.set_title(_("Error")) dialog.show() - - # add message to error log if error is not None: - keepnote.log_error(error, tracebk) + log_error(error, tracebk) def message(self, text, title="KeepNote", parent=None): - """Display a message window""" - if parent is None: parent = self.get_current_window() - - dialog = gtk.MessageDialog( - parent, - flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - type=gtk.MESSAGE_INFO, - buttons=gtk.BUTTONS_OK, - message_format=text) + dialog = Gtk.MessageDialog( + transient_for=parent, + modal=True, + destroy_with_parent=True, + message_type=Gtk.MessageType.INFO, + buttons=Gtk.ButtonsType.OK, + text=text + ) dialog.set_title(title) dialog.run() dialog.destroy() def ask_yes_no(self, text, title="KeepNote", parent=None): - """Display a yes/no window""" - if parent is None: parent = self.get_current_window() - - dialog = gtk.MessageDialog( - parent, - flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - type=gtk.MESSAGE_QUESTION, - buttons=gtk.BUTTONS_YES_NO, - message_format=text) - + dialog = Gtk.MessageDialog( + transient_for=parent, + modal=True, + destroy_with_parent=True, + message_type=Gtk.MessageType.QUESTION, + buttons=Gtk.ButtonsType.YES_NO, + text=text + ) dialog.set_title(title) response = dialog.run() dialog.destroy() - - return response == gtk.RESPONSE_YES + return response == Gtk.ResponseType.YES def quit(self): - """Quit the gtk event loop""" - keepnote.KeepNote.quit(self) - - gtk.accel_map_save(get_accel_file()) - gtk.main_quit() - - #=================================== - # callbacks - - def _on_window_close(self, window, event): - """Callback for window close event""" + super().quit() + Gtk.main_quit() + def _on_window_close(self, window): + from keepnote import log_error if window in self._windows: for ext in self.get_enabled_extensions(): try: if isinstance(ext, keepnote.gui.extension.Extension): ext.on_close_window(window) - except Exception, e: + except Exception as e: log_error(e, sys.exc_info()[2]) - - # remove window from window list self._windows.remove(window) - if window == self._current_window: self._current_window = None - - # quit app if last window closes if len(self._windows) == 0: self.quit() + return False def _on_window_focus(self, window, event): - """Callback for when a window gains focus""" self._current_window = window - #==================================== - # extension methods - def init_extensions_windows(self, windows=None, exts=None): - """Initialize all extensions for a window""" - + from keepnote import log_error if exts is None: exts = self.get_enabled_extensions() - if windows is None: windows = self.get_windows() - for window in windows: for ext in exts: try: if isinstance(ext, keepnote.gui.extension.Extension): ext.on_new_window(window) - except Exception, e: - log_error(e, sys.exc_info()[2]) + except Exception as e: + log_error(f"看看这里弹出的是啥'.", e, sys.exc_info()[2]) def install_extension(self, filename): - """Install a new extension""" - if self.ask_yes_no(_("Do you want to install the extension \"%s\"?") % - filename, "Extension Install"): - # install extension - new_exts = keepnote.KeepNote.install_extension(self, filename) - - # initialize extensions with windows + if self.ask_yes_no(f"Do you want to install the extension \"{filename}\"?", "Extension Install"): + new_exts = super().install_extension(filename) self.init_extensions_windows(exts=new_exts) - if len(new_exts) > 0: - self.message(_("Extension \"%s\" is now installed.") % - filename, _("Install Successful")) + self.message(f"Extension \"{filename}\" is now installed.", _("Install Successful")) return True - return False def uninstall_extension(self, ext_key): - """Install a new extension""" - if self.ask_yes_no( - _("Do you want to uninstall the extension \"%s\"?") % - ext_key, _("Extension Uninstall")): - if keepnote.KeepNote.uninstall_extension(self, ext_key): - self.message(_("Extension \"%s\" is now uninstalled.") % - ext_key, - _("Uninstall Successful")) + if self.ask_yes_no(f"Do you want to uninstall the extension \"{ext_key}\"?", _("Extension Uninstall")): + if super().uninstall_extension(ext_key): + self.message(f"Extension \"{ext_key}\" is now uninstalled.", _("Uninstall Successful")) return True - - return False + return False \ No newline at end of file diff --git a/keepnote/gui/basetreeview.py b/keepnote/gui/basetreeview.py index 4946fb967..30ebca89b 100644 --- a/keepnote/gui/basetreeview.py +++ b/keepnote/gui/basetreeview.py @@ -1,115 +1,72 @@ """ - KeepNote base class for treeview - """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports -import urllib - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gobject -from gtk import gdk - -# keepnote imports +import urllib.parse +import gi +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, Gdk, GObject +from gi.repository import GdkPixbuf +# keepnote.py imports import keepnote -from keepnote import unicode_gtk +from keepnote.util.platform import unicode_gtk from keepnote.notebook import NoteBookError from keepnote.gui.icons import get_node_icon -from keepnote.gui.treemodel import \ +from keepnote.gui.treemodel import ( get_path_from_node, iter_children -from keepnote.gui import treemodel, CLIPBOARD_NAME +) +from keepnote.gui import treemodel from keepnote.timestamp import get_str_timestamp _ = keepnote.translate - -MIME_NODE_COPY = "application/x-keepnote-node-copy" -MIME_TREE_COPY = "application/x-keepnote-tree-copy" -MIME_NODE_CUT = "application/x-keepnote-node-cut" +MIME_NODE_COPY = "application/x-keepnote.py-node-copy" +MIME_TREE_COPY = "application/x-keepnote.py-tree-copy" +MIME_NODE_CUT = "application/x-keepnote.py-node-cut" # treeview drag and drop config -DROP_URI = ("text/uri-list", 0, 1) -DROP_TREE_MOVE = ("drop_node", gtk.TARGET_SAME_APP, 0) -#DROP_NO = ("drop_no", gtk.TARGET_SAME_WIDGET, 0) - +DROP_URI = Gtk.DropTarget.new(Gdk.FileList, Gdk.DragAction.COPY) +DROP_TREE_MOVE = Gtk.DropTarget.new(str, Gdk.DragAction.MOVE) # treeview reorder rules REORDER_NONE = 0 REORDER_FOLDER = 1 REORDER_ALL = 2 - def parse_utf(text): - - # TODO: lookup the standard way to do this - - if (text[:2] in ('\xff\xfe', '\xfe\xff') or - (len(text) > 1 and text[1] == '\x00') or - (len(text) > 3 and text[3] == '\x00')): - return text.decode("utf16") + if (text[:2] in (b'\xff\xfe', b'\xfe\xff') or + (len(text) > 1 and text[1] == 0) or + (len(text) > 3 and text[3] == 0)): + return text.decode("utf-16") else: - text = text.replace("\x00", "") - return unicode(text, "utf8") - + text = text.replace(b"\x00", b"") + return text.decode("utf-8") def compute_new_path(model, target, drop_position): - """Compute the new path of a tagret rowiter in a treemodel""" path = model.get_path(target) - - if drop_position == gtk.TREE_VIEW_DROP_INTO_OR_BEFORE or \ - drop_position == gtk.TREE_VIEW_DROP_INTO_OR_AFTER: + if drop_position in (Gtk.TreeViewDropPosition.INTO_OR_BEFORE, Gtk.TreeViewDropPosition.INTO_OR_AFTER): return path + (0,) - elif drop_position == gtk.TREE_VIEW_DROP_BEFORE: + elif drop_position == Gtk.TreeViewDropPosition.BEFORE: return path - elif drop_position == gtk.TREE_VIEW_DROP_AFTER: + elif drop_position == Gtk.TreeViewDropPosition.AFTER: return path[:-1] + (path[-1] + 1,) else: - raise Exception("unknown drop position %s" % - str(drop_position)) - - -class TextRendererValidator (object): - def __init__(self, format=lambda x: x, parse=lambda x: x, - validate=lambda x: True): + raise Exception("unknown drop position %s" % str(drop_position)) +class TextRendererValidator: + def __init__(self, format=lambda x: x, parse=lambda x: x, validate=lambda x: True): def parse2(x): if not validate(x): raise Exception("Invalid") return parse(x) - self.format = format self.parse = parse2 - -class KeepNoteBaseTreeView (gtk.TreeView): - """Base class for treeviews of a NoteBook notes""" - +class KeepNoteBaseTreeView(Gtk.TreeView): def __init__(self): - gtk.TreeView.__init__(self) + super().__init__() self.model = None self.rich_model = None @@ -125,71 +82,49 @@ def __init__(self): self._get_node = self._get_node_default self._date_formats = {} + self.changed_start_id = None + self.changed_end_id = None + self.insert_id = None + self.delete_id = None + self.has_child_id = None + self._menu = None - # special attr's self._attr_title = "title" self._attr_icon = "icon" self._attr_icon_open = "icon_open" - # selection self.get_selection().connect("changed", self.__on_select_changed) self.get_selection().connect("changed", self.on_select_changed) - # row expand/collapse self.connect("row-expanded", self._on_row_expanded) self.connect("row-collapsed", self._on_row_collapsed) - # drag and drop state - self._is_dragging = False # whether drag is in progress + self._is_dragging = False self._drag_count = 0 - self._dest_row = None # current drag destition - self._reorder = REORDER_ALL # enum determining the kind of reordering - # that is possible via drag and drop - # region, defined by number of vertical pixels from top and bottom of - # the treeview widget, where drag scrolling will occur + self._dest_row = None + self._reorder = REORDER_ALL self._drag_scroll_region = 30 - # clipboard self.connect("copy-clipboard", self._on_copy_node) self.connect("copy-tree-clipboard", self._on_copy_tree) self.connect("cut-clipboard", self._on_cut_node) self.connect("paste-clipboard", self._on_paste_node) - # drop and drop events - self.connect("drag-begin", self._on_drag_begin) - self.connect("drag-end", self._on_drag_end) - self.connect("drag-motion", self._on_drag_motion) - self.connect("drag-drop", self._on_drag_drop) - self.connect("drag-data-delete", self._on_drag_data_delete) - self.connect("drag-data-get", self._on_drag_data_get) - self.connect("drag-data-received", self._on_drag_data_received) - - # configure drag and drop events - self.enable_model_drag_source( - gtk.gdk.BUTTON1_MASK, [DROP_TREE_MOVE], gtk.gdk.ACTION_MOVE) - self.drag_source_set( - gtk.gdk.BUTTON1_MASK, - [DROP_TREE_MOVE], - gtk.gdk.ACTION_MOVE) - self.enable_model_drag_dest([DROP_TREE_MOVE, DROP_URI], - gtk.gdk.ACTION_MOVE | - gtk.gdk.ACTION_COPY | - gtk.gdk.ACTION_LINK) - - self.drag_dest_set( - gtk.DEST_DEFAULT_HIGHLIGHT | gtk.DEST_DEFAULT_MOTION, - [DROP_TREE_MOVE, DROP_URI], - gtk.gdk.ACTION_DEFAULT | - gtk.gdk.ACTION_MOVE | - gtk.gdk.ACTION_COPY | - gtk.gdk.ACTION_LINK | - gtk.gdk.ACTION_PRIVATE | - gtk.gdk.ACTION_ASK) + drag_source = Gtk.DragSource.new() + drag_source.set_actions(Gdk.DragAction.MOVE) + drag_source.connect("prepare", self._on_drag_prepare) + drag_source.connect("drag-begin", self._on_drag_begin) + drag_source.connect("drag-end", self._on_drag_end) + self.add_controller(drag_source) + + drop_target = Gtk.DropTarget.new(str, Gdk.DragAction.MOVE | Gdk.DragAction.COPY) + drop_target.connect("motion", self._on_drag_motion) + drop_target.connect("drop", self._on_drag_drop) + self.add_controller(drop_target) def set_master_node(self, node): self._master_node = node - if self.rich_model: self.rich_model.set_master_node(node) @@ -198,8 +133,6 @@ def get_master_node(self): def set_notebook(self, notebook): self._notebook = notebook - - # NOTE: not used yet if self.model: if hasattr(self.model, "get_model"): self.model.get_model().set_notebook(notebook) @@ -207,7 +140,6 @@ def set_notebook(self, notebook): self.model.set_notebook(notebook) def set_get_node(self, get_node_func=None): - if get_node_func is None: self._get_node = self._get_node_default else: @@ -219,51 +151,40 @@ def _get_node_default(self, nodeid): return self._notebook.get_node_by_id(nodeid) def set_model(self, model): - """Set the model for the view""" - - # TODO: could group signal IDs into lists, for each detach - # if model already attached, disconnect all of its signals - if self.model is not None: - self.rich_model.disconnect(self.changed_start_id) - self.rich_model.disconnect(self.changed_end_id) - self.model.disconnect(self.insert_id) - self.model.disconnect(self.delete_id) - self.model.disconnect(self.has_child_id) + if self.model is not None and self.rich_model is not None: + if self.changed_start_id is not None: + self.rich_model.disconnect(self.changed_start_id) + if self.changed_end_id is not None: + self.rich_model.disconnect(self.changed_end_id) + if self.insert_id is not None: + self.model.disconnect(self.insert_id) + if self.delete_id is not None: + self.model.disconnect(self.delete_id) + if self.has_child_id is not None: + self.model.disconnect(self.has_child_id) self._node_col = None self._get_icon = None - # set new model self.model = model self.rich_model = None - gtk.TreeView.set_model(self, self.model) + super().set_model(self.model) - # set new model if self.model is not None: - # look to see if model has an inner model (happens when we have - # sorting models) if hasattr(self.model, "get_model"): self.rich_model = self.model.get_model() else: self.rich_model = model - # init signals for model self.rich_model.set_notebook(self._notebook) - self.changed_start_id = self.rich_model.connect( - "node-changed-start", self._on_node_changed_start) - self.changed_end_id = self.rich_model.connect( - "node-changed-end", self._on_node_changed_end) + self.changed_start_id = self.rich_model.connect("node-changed-start", self._on_node_changed_start) + self.changed_end_id = self.rich_model.connect("node-changed-end", self._on_node_changed_end) self._node_col = self.rich_model.get_node_column_pos() - self._get_icon = lambda row: \ - self.model.get_value( - row, self.rich_model.get_column_by_name("icon").pos) + self._get_icon = lambda row: self.model.get_value(row, self.rich_model.get_column_by_name("icon").pos) - self.insert_id = self.model.connect("row-inserted", - self.on_row_inserted) - self.delete_id = self.model.connect("row-deleted", - self.on_row_deleted) - self.has_child_id = self.model.connect( - "row-has-child-toggled", self.on_row_has_child_toggled) + self.insert_id = self.model.connect("row-inserted", self.on_row_inserted) + self.delete_id = self.model.connect("row-deleted", self.on_row_deleted) + self.has_child_id = self.model.connect("row-has-child-toggled", self.on_row_has_child_toggled) def set_popup_menu(self, menu): self._menu = menu @@ -272,27 +193,24 @@ def get_popup_menu(self): return self._menu def popup_menu(self, x, y, button, time): - """Display popup menu""" if self._menu is None: return - path = self.get_path_at_pos(int(x), int(y)) if path is None: return False - path = path[0] - if not self.get_selection().path_is_selected(path): self.get_selection().unselect_all() self.get_selection().select_path(path) + popup = Gtk.PopoverMenu.new_from_model(self._menu) + # popup.set_parent(self) + # if popup.get_parent() is None: + # self.set_child(popup) # 替代 set_parent - self._menu.popup(None, None, None, button, time) - self._menu.show() + popup.set_position(Gtk.PositionType.BOTTOM) + popup.popup() return True - #======================================== - # columns - def clear_columns(self): for col in reversed(self.get_columns()): self.remove_column(col) @@ -304,71 +222,36 @@ def get_column_by_attr(self, attr): return None def _add_title_render(self, column, attr): - - # make sure icon attributes are in model self._add_model_column(self._attr_icon) self._add_model_column(self._attr_icon_open) - # add renders - cell_icon = self._add_pixbuf_render( - column, self._attr_icon, self._attr_icon_open) - title_text = self._add_text_render( - column, attr, editable=True, - validator=TextRendererValidator(validate=lambda x: x != "")) - - # record reference to title_text renderer + cell_icon = self._add_pixbuf_render(column, self._attr_icon, self._attr_icon_open) + title_text = self._add_text_render(column, attr, editable=True, + validator=TextRendererValidator(validate=lambda x: x != "")) self.title_text = title_text - return cell_icon, title_text - def _add_text_render(self, column, attr, editable=False, - validator=TextRendererValidator()): - # cell renderer text - cell = gtk.CellRendererText() + def _add_text_render(self, column, attr, editable=False, validator=TextRendererValidator()): + cell = Gtk.CellRendererText() cell.set_fixed_height_from_font(1) column.pack_start(cell, True) - column.add_attribute(cell, 'text', - self.rich_model.get_column_by_name(attr).pos) - - column.add_attribute( - cell, 'cell-background', - self.rich_model.add_column( - "title_bgcolor", str, - lambda node: node.get_attr("title_bgcolor", None)).pos) - column.add_attribute( - cell, 'foreground', - self.rich_model.add_column( - "title_fgcolor", str, - lambda node: node.get_attr("title_fgcolor", None)).pos) - - # set edit callbacks + column.add_attribute(cell, 'text', self.rich_model.get_column_by_name(attr).pos) + column.add_attribute(cell, 'cell-background', self.rich_model.add_column("title_bgcolor", str, lambda node: node.get_attr("title_bgcolor", None)).pos) + column.add_attribute(cell, 'foreground', self.rich_model.add_column("title_fgcolor", str, lambda node: node.get_attr("title_fgcolor", None)).pos) + if editable: - cell.connect("edited", lambda r, p, t: self.on_edit_attr( - r, p, attr, t, validator=validator)) - cell.connect("editing-started", lambda r, e, p: - self.on_editing_started(r, e, p, attr, validator)) + cell.connect("edited", lambda r, p, t: self.on_edit_attr(r, p, attr, t, validator=validator)) + cell.connect("editing-started", lambda r, e, p: self.on_editing_started(r, e, p, attr, validator)) cell.connect("editing-canceled", self.on_editing_canceled) cell.set_property("editable", True) - return cell def _add_pixbuf_render(self, column, attr, attr_open=None): - - cell = gtk.CellRendererPixbuf() + cell = Gtk.CellRendererPixbuf() column.pack_start(cell, False) - column.add_attribute(cell, 'pixbuf', - self.rich_model.get_column_by_name(attr).pos) - #column.add_attribute( - # cell, 'cell-background', - # self.rich_model.add_column( - # "title_bgcolor", str, - # lambda node: node.get_attr("title_bgcolor", None)).pos) - + column.add_attribute(cell, 'pixbuf', self.rich_model.get_column_by_name(attr).pos) if attr_open: - column.add_attribute( - cell, 'pixbuf-expander-open', - self.rich_model.get_column_by_name(attr_open).pos) - + column.add_attribute(cell, 'pixbuf-expander-open', self.rich_model.get_column_by_name(attr_open).pos) return cell def _get_model_column(self, attr, mapfunc=lambda x: x): @@ -379,7 +262,6 @@ def _get_model_column(self, attr, mapfunc=lambda x: x): return col def get_col_type(self, datatype): - if datatype == "string": return str elif datatype == "integer": @@ -398,11 +280,7 @@ def get_col_mapfunc(self, datatype): return lambda x: x def _add_model_column(self, attr, add_sort=True, mapfunc=lambda x: x): - - # get attribute definition from notebook attr_def = self._notebook.attr_defs.get(attr) - - # get datatype if attr_def is not None: datatype = attr_def.datatype default = attr_def.default @@ -410,10 +288,7 @@ def _add_model_column(self, attr, add_sort=True, mapfunc=lambda x: x): datatype = "string" default = "" - # value fetching get = lambda node: mapfunc(node.get_attr(attr, default)) - - # get coltype mapfunc_sort = lambda x: x if datatype == "string": coltype = str @@ -433,141 +308,74 @@ def _add_model_column(self, attr, add_sort=True, mapfunc=lambda x: x): coltype = str coltype_sort = str - # builtin column types if attr == self._attr_icon: - coltype = gdk.Pixbuf + coltype = GdkPixbuf.Pixbuf coltype_sort = None - get = lambda node: get_node_icon(node, False, - node in self.rich_model.fades) + get = lambda node: get_node_icon(node, False, node in self.rich_model.fades) elif attr == self._attr_icon_open: - coltype = gdk.Pixbuf + coltype = GdkPixbuf.Pixbuf coltype_sort = None - get = lambda node: get_node_icon(node, True, - node in self.rich_model.fades) + get = lambda node: get_node_icon(node, True, node in self.rich_model.fades) - # get/make model column col = self.rich_model.get_column_by_name(attr) if col is None: col = treemodel.TreeModelColumn(attr, coltype, attr=attr, get=get) self.rich_model.append_column(col) - # define column sorting if add_sort and coltype_sort is not None: attr_sort = attr + "_sort" col = self.rich_model.get_column_by_name(attr_sort) if col is None: - get_sort = lambda node: mapfunc_sort( - node.get_attr(attr, default)) - col = treemodel.TreeModelColumn( - attr_sort, coltype_sort, attr=attr, get=get_sort) + get_sort = lambda node: mapfunc_sort(node.get_attr(attr, default)) + col = treemodel.TreeModelColumn(attr_sort, coltype_sort, attr=attr, get=get_sort) self.rich_model.append_column(col) def set_date_formats(self, formats): - """Sets the date formats of the treemodel""" self._date_formats = formats def format_timestamp(self, timestamp): - return (get_str_timestamp(timestamp, formats=self._date_formats) - if timestamp is not None else u"") - - #========================================= - # model change callbacks + return (get_str_timestamp(timestamp, formats=self._date_formats) if timestamp is not None else "") def _on_node_changed_start(self, model, nodes): - # remember which nodes are selected self.__sel_nodes2 = list(self.__sel_nodes) - - # suppress selection changes while nodes are changing self.__suppress_sel = True - - # cancel editing self.cancel_editing() - - # save scrolling - self.__scroll = self.widget_to_tree_coords(0, 0) + self.__scroll = self.convert_widget_to_tree_coords(0, 0) def _on_node_changed_end(self, model, nodes): - - # maintain proper expansion for node in nodes: - if node == self._master_node: for child in node.get_children(): if self.is_node_expanded(child): - path = get_path_from_node( - self.model, child, - self.rich_model.get_node_column_pos()) + path_tuple = get_path_from_node(self.model, child, self.rich_model.get_node_column_pos()) + path = Gtk.TreePath.new_from_indices(path_tuple) self.expand_row(path, False) else: try: - path = get_path_from_node( - self.model, node, - self.rich_model.get_node_column_pos()) + path_tuple = get_path_from_node(self.model, node, self.rich_model.get_node_column_pos()) + path = Gtk.TreePath.new_from_indices(path_tuple) except: path = None if path is not None: parent = node.get_parent() - - # NOTE: parent may lose expand state if it has one child - # therefore, we should expand parent if it exists and is - # visible (i.e. len(path)>1) in treeview - if (parent and self.is_node_expanded(parent) and - len(path) > 1): + if parent and self.is_node_expanded(parent) and len(path) > 1: self.expand_row(path[:-1], False) - if self.is_node_expanded(node): self.expand_row(path, False) - # if nodes still exist, and expanded, try to reselect them - sel_count = 0 - selection = self.get_selection() - for node in self.__sel_nodes2: - sel_count += 1 - if node.is_valid(): - path2 = get_path_from_node( - self.model, node, self.rich_model.get_node_column_pos()) - if (path2 is not None and - (len(path2) <= 1 or self.row_expanded(path2[:-1]))): - # reselect and scroll to node - selection.select_path(path2) - - # restore scroll - gobject.idle_add(lambda: self.scroll_to_point(*self.__scroll)) - - # resume emitting selection changes - self.__suppress_sel = False - - # emit de-selection - if sel_count == 0: - self.select_nodes([]) - def __on_select_changed(self, treeselect): - """Keep track of which nodes are selected""" - self.__sel_nodes = self.get_selected_nodes() if self.__suppress_sel: self.get_selection().stop_emission("changed") def is_node_expanded(self, node): - # query expansion from nodes return node.get_attr("expanded", False) def set_node_expanded(self, node, expand): - # save expansion in node node.set_attr("expanded", expand) - # TODO: do I notify listeners of expand change - # Will this interfere with on_node_changed callbacks - def _on_row_expanded(self, treeview, it, path): - """Callback for row expand - - Performs smart expansion (remembers children expansion)""" - - # save expansion in node self.set_node_expanded(self.model.get_value(it, self._node_col), True) - - # recursively expand nodes that should be expanded def walk(it): child = self.model.iter_children(it) while child: @@ -580,7 +388,6 @@ def walk(it): walk(it) def _on_row_collapsed(self, treeview, it, path): - # save expansion in node self.set_node_expanded(self.model.get_value(it, self._node_col), False) def on_row_inserted(self, model, path, it): @@ -594,22 +401,15 @@ def on_row_has_child_toggled(self, model, path, it): def cancel_editing(self): if self.editing_path: - self.set_cursor_on_cell(self.editing_path, None, None, False) - - #=========================================== - # actions + self.set_cursor(self.editing_path, None, False) def expand_node(self, node): - """Expand a node in TreeView""" - path = get_path_from_node(self.model, node, - self.rich_model.get_node_column_pos()) + path = get_path_from_node(self.model, node, self.rich_model.get_node_column_pos()) if path is not None: self.expand_to_path(path) def collapse_all_beneath(self, path): - """Collapse all children beneath a path""" it = self.model.get_iter(path) - def walk(it): for child in iter_children(self.model, it): walk(child) @@ -617,34 +417,24 @@ def walk(it): self.collapse_row(path2) walk(it) - #=========================================== - # selection - def select_nodes(self, nodes): - """Select nodes in treeview""" - - # NOTE: for now only select one node if len(nodes) > 0: node = nodes[0] - path = get_path_from_node(self.model, node, - self.rich_model.get_node_column_pos()) + path = get_path_from_node(self.model, node, self.rich_model.get_node_column_pos()) if path is not None: if len(path) > 1: self.expand_to_path(path[:-1]) self.set_cursor(path) - gobject.idle_add(lambda: self.scroll_to_cell(path)) + GObject.idle_add(lambda: self.scroll_to_cell(path)) else: - # unselect all nodes self.get_selection().unselect_all() def on_select_changed(self, treeselect): - """Callback for when selection changes""" nodes = self.get_selected_nodes() self.emit("select-nodes", nodes) return True def get_selected_nodes(self): - """Returns a list of currently selected nodes""" iters = self.get_selected_iters() if len(iters) == 0: if self.editing_path: @@ -652,30 +442,15 @@ def get_selected_nodes(self): if node: return [node] return [] - else: - return [self.model.get_value(it, self._node_col) - for it in iters] + return [self.model.get_value(it, self._node_col) for it in iters] def get_selected_iters(self): - """Return a list of currently selected TreeIter's""" iters = [] - self.get_selection().selected_foreach(lambda model, path, it: - iters.append(it)) + self.get_selection().selected_foreach(lambda model, path, it: iters.append(it)) return iters - # TODO: add a reselect if node is deleted - # select next sibling or parent - - #============================================ - # editing attr - - def on_editing_started(self, cellrenderer, editable, path, attr, - validator=TextRendererValidator()): - """Callback for start of title editing""" - # remember editing state + def on_editing_started(self, cellrenderer, editable, path, attr, validator=TextRendererValidator()): self.editing_path = path - - # get node being edited and init gtk.Entry widget node = self.model.get_value(self.model.get_iter(path), self._node_col) if node is not None: val = node.get_attr(attr) @@ -683,209 +458,73 @@ def on_editing_started(self, cellrenderer, editable, path, attr, editable.set_text(validator.format(val)) except: pass - - gobject.idle_add(lambda: self.scroll_to_cell(path)) + GObject.idle_add(lambda: self.scroll_to_cell(path)) def on_editing_canceled(self, cellrenderer): - """Callback for canceled of title editing""" - # remember editing state self.editing_path = None - def on_edit_attr(self, cellrenderertext, path, attr, new_text, - validator=TextRendererValidator()): - """Callback for completion of title editing""" - - # remember editing state + def on_edit_attr(self, cellrenderertext, path, attr, new_text, validator=TextRendererValidator()): self.editing_path = None - new_text = unicode_gtk(new_text) - - # get node being edited node = self.model.get_value(self.model.get_iter(path), self._node_col) if node is None: return - - # determine value from new_text, if invalid, ignore it try: new_val = validator.parse(new_text) except: return - - # set new attr and catch errors try: node.set_attr(attr, new_val) - except NoteBookError, e: + except NoteBookError as e: self.emit("error", e.msg, e) - - # reselect node - # need to get path again because sorting may have changed - path = get_path_from_node(self.model, node, - self.rich_model.get_node_column_pos()) + path = get_path_from_node(self.model, node, self.rich_model.get_node_column_pos()) if path is not None: self.set_cursor(path) - gobject.idle_add(lambda: self.scroll_to_cell(path)) - + GObject.idle_add(lambda: self.scroll_to_cell(path)) self.emit("edit-node", node, attr, new_val) - #============================================= - # copy and paste - def _on_copy_node(self, widget): - """Copy a node onto the clipboard""" - nodes = self.get_selected_nodes() if len(nodes) > 0: - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - - targets = [(MIME_NODE_COPY, gtk.TARGET_SAME_APP, -1), - ("text/html", 0, -1), - ("text/plain", 0, -1)] - - clipboard.set_with_data(targets, self._get_selection_data, - self._clear_selection_data, - nodes) + clipboard = Gtk.Clipboard.get_default(self.get_display()) + content = Gdk.ContentProvider.new_for_value(GObject.Value(str, ";".join([node.get_attr("nodeid") for node in nodes]))) + clipboard.set_content(content) def _on_copy_tree(self, widget): - nodes = self.get_selected_nodes() if len(nodes) > 0: - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - - targets = [(MIME_TREE_COPY, gtk.TARGET_SAME_APP, -1), - (MIME_NODE_COPY, gtk.TARGET_SAME_APP, -1), - ("text/html", 0, -1), - ("text/plain", 0, -1)] - - clipboard.set_with_data(targets, self._get_selection_data, - self._clear_selection_data, - nodes) + clipboard = Gtk.Clipboard.get_default(self.get_display()) + content = Gdk.ContentProvider.new_for_value(GObject.Value(str, ";".join([node.get_attr("nodeid") for node in nodes]))) + clipboard.set_content(content) def _on_cut_node(self, widget): - """Copy a node onto the clipboard""" - - nodes = widget.get_selected_nodes() + nodes = self.get_selected_nodes() if len(nodes) > 0: - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - - targets = [(MIME_NODE_CUT, gtk.TARGET_SAME_APP, -1), - ("text/html", 0, -1), - ("text/plain", 0, -1)] - - clipboard.set_with_data(targets, self._get_selection_data, - self._clear_selection_data, - nodes) - + clipboard = Gtk.Clipboard.get_default(self.get_display()) + content = Gdk.ContentProvider.new_for_value(GObject.Value(str, ";".join([node.get_attr("nodeid") for node in nodes]))) + clipboard.set_content(content) self._fade_nodes(nodes) def _on_paste_node(self, widget): - """Paste into the treeview""" - - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) + clipboard = Gtk.Clipboard.get_default(self.get_display()) + clipboard.read_value_async(GObject.TYPE_STRING, 0, None, self._do_paste_nodes) - targets = clipboard.wait_for_targets() - if targets is None: - # nothing on clipboard - return - targets = set(targets) - - if MIME_NODE_CUT in targets: - # request KEEPNOTE node objects - clipboard.request_contents(MIME_NODE_CUT, self._do_paste_nodes) - - elif MIME_TREE_COPY in targets: - # request KEEPNOTE node objects - clipboard.request_contents(MIME_TREE_COPY, self._do_paste_nodes) - - elif MIME_NODE_COPY in targets: - # request KEEPNOTE node objects - clipboard.request_contents(MIME_NODE_COPY, self._do_paste_nodes) - - def _get_selection_data(self, clipboard, selection_data, info, nodes): - """Callback for when Clipboard needs selection data""" - - if MIME_NODE_CUT in selection_data.target: - # set nodes - selection_data.set(MIME_NODE_CUT, 8, - ";".join([node.get_attr("nodeid") - for node in nodes])) - - elif MIME_TREE_COPY in selection_data.target: - # set nodes - selection_data.set(MIME_TREE_COPY, 8, - ";".join([node.get_attr("nodeid") - for node in nodes])) - - elif MIME_NODE_COPY in selection_data.target: - # set nodes - selection_data.set(MIME_NODE_COPY, 8, - ";".join([node.get_attr("nodeid") - for node in nodes])) - - elif "text/html" in selection_data.target: - # set html - selection_data.set("text/html", 8, - " ".join(["%s" % - (node.get_url(), - node.get_title()) - for node in nodes])) - - else: - # set plain text - selection_data.set_text(" ".join([node.get_url() - for node in nodes])) - - def _do_paste_nodes(self, clipboard, selection_data, data): - """Paste nodes into treeview""" + def _do_paste_nodes(self, clipboard, result, data): if self._notebook is None: return - - # find paste location selected = self.get_selected_nodes() - if len(selected) > 0: - parent = selected[0] - else: - parent = self._notebook - - # find nodes to paste - nodeids = selection_data.data.split(";") - nodes = [self._get_node(nodeid) for nodeid in nodeids] - - #nodes = [self._notebook.get_node_by_id(nodeid) - # for nodeid in nodeids] - - if selection_data.target == MIME_NODE_CUT: - for node in nodes: - try: - if node is not None: - node.move(parent) - except: - keepnote.log_error() - - elif selection_data.target == MIME_TREE_COPY: + parent = selected[0] if len(selected) > 0 else self._notebook + try: + value = clipboard.read_value_finish(result) + nodeids = value.split(";") + nodes = [self._get_node(nodeid) for nodeid in nodeids] for node in nodes: - try: - if node is not None: - node.duplicate(parent, recurse=True) - except Exception: - keepnote.log_error() - - elif selection_data.target == MIME_NODE_COPY: - for node in nodes: - try: - if node is not None: - node.duplicate(parent) - except Exception: - keepnote.log_error() - - def _clear_selection_data(self, clipboard, data): - """Callback for when Clipboard contents are reset""" - self._clear_fading() - - #============================================ - # node fading + if node is not None: + node.move(parent) + except Exception as e: + keepnote.log_error(e) def _clear_fading(self): - """Clear faded nodes""" nodes = list(self.rich_model.fades) self.rich_model.fades.clear() if self._notebook: @@ -897,9 +536,6 @@ def _fade_nodes(self, nodes): self.rich_model.fades.add(node) node.notify_change(False) - #============================================= - # drag and drop - def set_reorder(self, order): self._reorder = order @@ -913,355 +549,132 @@ def get_drag_node(self): return self.model.get_value(iters[0], self._node_col) def get_drag_nodes(self): - return [self.model.get_value(it, self._node_col) - for it in self.get_selected_iters()] - - # drag and drop callbacks + return [self.model.get_value(it, self._node_col) for it in self.get_selected_iters()] def _on_drag_timer(self): - - # process scrolling self._process_drag_scroll() return self._is_dragging def _process_drag_scroll(self): - - # get header height - header_height = [0] - + header_height = 0 if self.get_headers_visible(): - self.forall(lambda w, d: header_height.__setitem__( - 0, w.allocation.height), None) - - # get mouse poistion in tree coordinates + header_height = self.get_column(0).get_area().height x, y = self.get_pointer() - x, y = self.widget_to_tree_coords(x, y - header_height[0]) - - # get visible rect in tree coordinates + x, y = self.convert_widget_to_tree_coords(x, y - header_height) rect = self.get_visible_rect() - def dist_to_scroll(dist): - """Convert a distance outside the widget into a scroll step""" - - # TODO: put these scroll constants somewhere else small_scroll_dist = 30 small_scroll = 30 fast_scroll_coeff = small_scroll - if dist < small_scroll_dist: - # slow scrolling self._drag_count = 0 return small_scroll else: - # fast scrolling self._drag_count += 1 return small_scroll + fast_scroll_coeff * self._drag_count**2 - - # test for scroll boundary dist = rect.y - y if dist > 0: self.scroll_to_point(-1, rect.y - dist_to_scroll(dist)) - else: dist = y - rect.y - rect.height if dist > 0: self.scroll_to_point(-1, rect.y + dist_to_scroll(dist)) - def _on_drag_begin(self, treeview, drag_context): - """Callback for beginning of drag and drop""" - self.stop_emission("drag-begin") + def _on_drag_prepare(self, source, x, y): + iters = self.get_selected_iters() + if len(iters) == 0: + return None + source_path = self.model.get_path(iters[0]) + return Gdk.ContentProvider.new_for_value(GObject.Value(str, str(source_path))) + def _on_drag_begin(self, source, drag): iters = self.get_selected_iters() if len(iters) == 0: return - - # use first selected item for icon source = iters[0] - - # setup the drag icon if self._get_icon: pixbuf = self._get_icon(source) - pixbuf = pixbuf.scale_simple(40, 40, gtk.gdk.INTERP_BILINEAR) - self.drag_source_set_icon_pixbuf(pixbuf) - - # clear the destination row + pixbuf = pixbuf.scale_simple(40, 40, GdkPixbuf.InterpType.BILINEAR) + drag.set_icon(Gdk.Texture.new_for_pixbuf(pixbuf), 0, 0) self._dest_row = None - self.cancel_editing() - self._is_dragging = True self._drag_count = 0 - gobject.timeout_add(200, self._on_drag_timer) + GObject.timeout_add(200, self._on_drag_timer) - def _on_drag_motion(self, treeview, drag_context, x, y, eventtime, - stop_emit=True): - """ - Callback for drag motion. - Indicate which drops are allowed (cannot drop into descendant). - Also record the destination for later use. - """ - - # override gtk's default drag motion code - if stop_emit: - self.stop_emission("drag-motion") - - # if reordering is disabled then terminate the drag + def _on_drag_motion(self, target, x, y, data): if self._reorder == REORDER_NONE: - return False - - # determine destination row - dest_row = treeview.get_dest_row_at_pos(x, y) - + return Gdk.DragAction(0) + dest_row = self.get_dest_row_at_pos(x, y) if dest_row is not None: - # get target info target_path, drop_position = dest_row target = self.model.get_iter(target_path) target_node = self.model.get_value(target, self._node_col) + self.set_drag_dest_row(target_path, drop_position) + self._dest_row = (target_path, drop_position) + return Gdk.DragAction.MOVE + return Gdk.DragAction(0) - # process node drops - if "drop_node" in drag_context.targets: - # get source - source_widget = drag_context.get_source_widget() - source_nodes = source_widget.get_drag_nodes() - - # determine if drag is allowed - allow = True - for source_node in source_nodes: - if not self._drop_allowed(source_node, target_node, - drop_position): - allow = False - - if allow: - self.set_drag_dest_row(target_path, drop_position) - self._dest_row = target_path, drop_position - drag_context.drag_status(gdk.ACTION_MOVE, eventtime) - - elif "text/uri-list" in drag_context.targets: - if self._drop_allowed(None, target_node, drop_position): - self.set_drag_dest_row(target_path, drop_position) - self._dest_row = target_path, drop_position - drag_context.drag_status(gdk.ACTION_COPY, eventtime) - - def _on_drag_drop(self, widget, drag_context, x, y, timestamp): - """ - Callback for drop event - """ - # override gtk's default drag drop code - self.stop_emission("drag-drop") - - # if reordering is disabled, reject drop + def _on_drag_drop(self, target, value, x, y): if self._reorder == REORDER_NONE: - drag_context.finish(False, False, timestamp) return False - - # cause get data event to occur - if "drop_node" in drag_context.targets: - self.drag_get_data(drag_context, "drop_node") - - elif "text/uri-list" in drag_context.targets: - self.drag_get_data(drag_context, "text/uri-list") - - # accept drop - return True - - def _on_drag_end(self, widget, drag_context): - """Callback for end of dragging""" - self._is_dragging = False - - def _on_drag_data_delete(self, widget, drag_context): - """ - Callback for deleting data due to a 'move' event - """ - - # override gtk's delete event - self.stop_emission("drag-data-delete") - - # do nothing else, deleting old copy is handled else where - - def _on_drag_data_get(self, widget, drag_context, selection_data, - info, timestamp): - """ - Callback for when data is requested by drag_get_data - """ - - # override gtk's data get code - self.stop_emission("drag-data-get") - - # TODO: think more about what data to actually set for - # tree_set_row_drag_data() - iters = self.get_selected_iters() - if len(iters) > 0: - source = iters[0] - source_path = self.model.get_path(source) - selection_data.tree_set_row_drag_data(self.model, source_path) - - def _on_drag_data_received(self, treeview, drag_context, x, y, - selection_data, info, eventtime): - - """ - Callback for when data is received from source widget - """ - # override gtk's data received code - self.stop_emission("drag-data-received") - - # NOTE: force one more call to motion, since Windows ignores - # cross app drag calls - self._on_drag_motion(treeview, drag_context, x, y, eventtime, - stop_emit=False) - - # if no destination, give up. Occurs when drop is not allowed if self._dest_row is None: - drag_context.finish(False, False, eventtime) - return - - if "drop_node" in drag_context.targets: - # process node drops - self._on_drag_node_received(treeview, drag_context, x, y, - selection_data, info, eventtime) - - elif "text/uri-list" in drag_context.targets: - target_path, drop_position = self._dest_row - target = self.model.get_iter(target_path) - target_node = self.model.get_value(target, self._node_col) - - if self._drop_allowed(None, target_node, drop_position): - new_path = compute_new_path(self.model, target, drop_position) - parent = self._get_node_from_path(new_path[:-1]) - - uris = parse_utf(selection_data.data) - uris = [xx for xx in (urllib.unquote(uri.strip()) - for uri in uris.split("\n")) - if len(xx) > 0 and xx[0] != "#"] - - for uri in reversed(uris): - if uri.startswith("file://"): - uri = uri[7:] - if keepnote.get_platform() == "windows": - # remove one more '/' for windows - uri = uri[1:] - self.emit("drop-file", parent, new_path[-1], uri) - drag_context.finish(True, False, eventtime) + return False + target_path, drop_position = self._dest_row + target = self.model.get_iter(target_path) + target_node = self.model.get_value(target, self._node_col) + new_path = compute_new_path(self.model, target, drop_position) + new_parent = self._get_node_from_path(new_path[:-1]) + index = new_path[-1] + source_path = Gtk.TreePath.new_from_string(value) + source = self.model.get_iter(source_path) + source_node = self.model.get_value(source, self._node_col) + if not self._drop_allowed(source_node, target_node, drop_position): + return False + try: + source_node.move(new_parent, index) + self.emit("goto-node", source_node) + return True + except NoteBookError as e: + self.emit("error", e.msg, e) + return False - else: - # unknown drop type, reject - drag_context.finish(False, False, eventtime) + def _on_drag_end(self, source, drag, delete): + self._is_dragging = False def _get_node_from_path(self, path): - if len(path) == 0: - # TODO: donot use master node (lookup parent instead) assert self._master_node is not None return self._master_node else: it = self.model.get_iter(path) return self.model.get_value(it, self._node_col) - def _on_drag_node_received(self, treeview, drag_context, x, y, - selection_data, info, eventtime): - """ - Callback for node received from another widget - """ - # get target - target_path, drop_position = self._dest_row - target = self.model.get_iter(target_path) - target_node = self.model.get_value(target, self._node_col) - new_path = compute_new_path(self.model, target, drop_position) - - # get source - source_widget = drag_context.get_source_widget() - source_nodes = source_widget.get_drag_nodes() - if len(source_nodes) == 0: - drag_context.finish(False, False, eventtime) - return - - # determine new parent and index - new_parent_path = new_path[:-1] - new_parent = self._get_node_from_path(new_parent_path) - index = new_path[-1] - - # move each source node - for source_node in source_nodes: - # determine if drop is allowed - if not self._drop_allowed(source_node, target_node, drop_position): - drag_context.finish(False, False, eventtime) - continue - - # perform move in notebook model - try: - source_node.move(new_parent, index) - index = new_parent.get_children().index(source_node) - # NOTE: we update index in case moving source_node changes - # the drop path - except NoteBookError, e: - # TODO: think about whether finish should always be false - drag_context.finish(False, False, eventtime) - self.emit("error", e.msg, e) - return - - # re-establish selection on source node - self.emit("goto-node", source_nodes[0]) - - # notify that drag was successful - drag_context.finish(True, True, eventtime) - def _drop_allowed(self, source_node, target_node, drop_position): - """Determine if drop is allowed""" - - # source cannot be an ancestor of target ptr = target_node while ptr is not None: if ptr == source_node: return False ptr = ptr.get_parent() - - drop_into = (drop_position == gtk.TREE_VIEW_DROP_INTO_OR_BEFORE or - drop_position == gtk.TREE_VIEW_DROP_INTO_OR_AFTER) - + drop_into = (drop_position == Gtk.TreeViewDropPosition.INTO_OR_BEFORE or + drop_position == Gtk.TreeViewDropPosition.INTO_OR_AFTER) return ( - # (1) do not let nodes move out of notebook root not (target_node.get_parent() is None and not drop_into) and - - # (2) do not let nodes move into nodes that don't allow children not (not target_node.allows_children() and drop_into) and - - # (3) if reorder == FOLDER, ensure drop is either INTO a node - # or new_parent == old_parent - not (source_node and - self._reorder == REORDER_FOLDER and not drop_into and - target_node.get_parent() == source_node.get_parent())) - - -gobject.type_register(KeepNoteBaseTreeView) -gobject.signal_new("goto-node", KeepNoteBaseTreeView, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new( - "activate-node", KeepNoteBaseTreeView, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new( - "delete-node", KeepNoteBaseTreeView, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("goto-parent-node", KeepNoteBaseTreeView, - gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()) -gobject.signal_new("copy-clipboard", KeepNoteBaseTreeView, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) -gobject.signal_new("copy-tree-clipboard", KeepNoteBaseTreeView, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) -gobject.signal_new("cut-clipboard", KeepNoteBaseTreeView, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) -gobject.signal_new("paste-clipboard", KeepNoteBaseTreeView, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) -gobject.signal_new("select-nodes", KeepNoteBaseTreeView, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("edit-node", KeepNoteBaseTreeView, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object, str, str)) -gobject.signal_new("drop-file", KeepNoteBaseTreeView, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object, int, str)) -gobject.signal_new("error", KeepNoteBaseTreeView, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str, object,)) + not (source_node and self._reorder == REORDER_FOLDER and not drop_into and + target_node.get_parent() == source_node.get_parent()) + ) + +GObject.type_register(KeepNoteBaseTreeView) +GObject.signal_new("goto-node", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, (object,)) +GObject.signal_new("activate-node", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, (object,)) +GObject.signal_new("delete-node", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, (object,)) +GObject.signal_new("goto-parent-node", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, ()) +GObject.signal_new("copy-clipboard", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, ()) +GObject.signal_new("copy-tree-clipboard", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, ()) +GObject.signal_new("cut-clipboard", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, ()) +GObject.signal_new("paste-clipboard", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, ()) +GObject.signal_new("select-nodes", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, (object,)) +GObject.signal_new("edit-node", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, (object, str, str)) +GObject.signal_new("drop-file", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, (object, int, str)) +GObject.signal_new("error", KeepNoteBaseTreeView, GObject.SignalFlags.RUN_LAST, None, (str, object,)) \ No newline at end of file diff --git a/keepnote/gui/colortool.py b/keepnote/gui/colortool.py index 9d4c3302a..a843b756c 100644 --- a/keepnote/gui/colortool.py +++ b/keepnote/gui/colortool.py @@ -1,674 +1,444 @@ -""" - - KeepNote - Color picker for the toolbar - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -from gtk import gdk -import gtk.glade -import gobject -import pango - -# keepnote imports +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') +gi.require_version('PangoCairo', '1.0') +gi.require_version('Pango', '1.0') +from gi.repository import Gtk, Gdk, GdkPixbuf, Pango, PangoCairo, GObject +import cairo import keepnote _ = keepnote.translate - -#============================================================================= -# constants - +# Constants FONT_LETTER = "A" - DEFAULT_COLORS_FLOAT = [ # lights - (1, .6, .6), - (1, .8, .6), - (1, 1, .6), - (.6, 1, .6), - (.6, 1, 1), - (.6, .6, 1), - (1, .6, 1), - + (1, .6, .6), (1, .8, .6), (1, 1, .6), (.6, 1, .6), (.6, 1, 1), (.6, .6, 1), (1, .6, 1), # trues - (1, 0, 0), - (1, .64, 0), - (1, 1, 0), - (0, 1, 0), - (0, 1, 1), - (0, 0, 1), - (1, 0, 1), - + (1, 0, 0), (1, .64, 0), (1, 1, 0), (0, 1, 0), (0, 1, 1), (0, 0, 1), (1, 0, 1), # darks - (.5, 0, 0), - (.5, .32, 0), - (.5, .5, 0), - (0, .5, 0), - (0, .5, .5), - (0, 0, .5), - (.5, 0, .5), - + (.5, 0, 0), (.5, .32, 0), (.5, .5, 0), (0, .5, 0), (0, .5, .5), (0, 0, .5), (.5, 0, .5), # white, gray, black - (1, 1, 1), - (.9, .9, .9), - (.75, .75, .75), - (.5, .5, .5), - (.25, .25, .25), - (.1, .1, .1), - (0, 0, 0), + (1, 1, 1), (.9, .9, .9), (.75, .75, .75), (.5, .5, .5), (.25, .25, .25), (.1, .1, .1), (0, 0, 0), ] - -#============================================================================= -# color conversions - +# Color conversion functions def color_float_to_int8(color): - return (int(255*color[0]), int(255*color[1]), int(255*color[2])) - + return (int(255 * color[0]), int(255 * color[1]), int(255 * color[2])) def color_float_to_int16(color): - return (int(65535*color[0]), int(65535*color[1]), int(65535*color[2])) - - -def color_int8_to_int16(color): - return (256*color[0], 256*color[1], 256*color[2]) - - -def color_int16_to_int8(color): - return (color[0]//256, color[1]//256, color[2]//256) - - -def color_str_to_int8(colorstr): - - # "#AABBCC" ==> (170, 187, 204) - return (int(colorstr[1:3], 16), - int(colorstr[3:5], 16), - int(colorstr[5:7], 16)) - - -def color_str_to_int16(colorstr): - - # "#AABBCC" ==> (43520, 47872, 52224) - return (int(colorstr[1:3], 16)*256, - int(colorstr[3:5], 16)*256, - int(colorstr[5:7], 16)*256) - + return (int(65535 * color[0]), int(65535 * color[1]), int(65535 * color[2])) def color_int16_to_str(color): - return "#%02x%02x%02x" % (color[0]//256, color[1]//256, color[2]//256) - + return f"#{color[0]//256:02x}{color[1]//256:02x}{color[2]//256:02x}" def color_int8_to_str(color): - return "#%02x%02x%02x" % (color[0], color[1], color[2]) + return f"#{color[0]:02x}{color[1]:02x}{color[2]:02x}" +def color_str_to_int16(colorstr): + return (int(colorstr[1:3], 16) * 256, int(colorstr[3:5], 16) * 256, int(colorstr[5:7], 16) * 256) -# convert to str -DEFAULT_COLORS = [color_int8_to_str(color_float_to_int8(color)) - for color in DEFAULT_COLORS_FLOAT] - - -#============================================================================= -# color menus - -class ColorTextImage (gtk.Image): - """Image widget that display a color box with and without text""" +DEFAULT_COLORS = [color_int8_to_str(color_float_to_int8(color)) for color in DEFAULT_COLORS_FLOAT] +# ColorTextImage class +class ColorTextImage(Gtk.Image): def __init__(self, width, height, letter, border=True): - gtk.Image.__init__(self) + super().__init__() self.width = width self.height = height self.letter = letter self.border = border self.marginx = int((width - 10) / 2.0) - self.marginy = - int((height - 12) / 2.0) - self._pixmap = None - self._colormap = None + self.marginy = -int((height - 12) / 2.0) + self._pixbuf = None self.fg_color = None self.bg_color = None - self._exposed = False - - self.connect("parent-set", self.on_parent_set) - self.connect("expose-event", self.on_expose_event) - - def on_parent_set(self, widget, old_parent): - self._exposed = False - - def on_expose_event(self, widget, event): - """Set up colors on exposure""" - - if not self._exposed: - self._exposed = True - self.init_colors() - - def init_colors(self): - self._pixmap = gdk.Pixmap(None, self.width, self.height, 24) - self._colormap = self._pixmap.get_colormap() - #self._colormap = gtk.gdk.colormap_get_system() - #gtk.gdk.screen_get_default().get_default_colormap() - self._gc = self._pixmap.new_gc() - - self._context = self.get_pango_context() - self._fontdesc = pango.FontDescription("sans bold 10") - - if isinstance(self.fg_color, basestring): - self.fg_color = self._colormap.alloc_color(self.fg_color) - elif self.fg_color is None: - self.fg_color = self._colormap.alloc_color( - self.get_style().text[gtk.STATE_NORMAL]) - if isinstance(self.bg_color, basestring): - self.bg_color = self._colormap.alloc_color(self.bg_color) - elif self.bg_color is None: - self.bg_color = self._colormap.alloc_color( - self.get_style().bg[gtk.STATE_NORMAL]) + self.connect("realize", self.on_realize) - self._border_color = self._colormap.alloc_color(0, 0, 0) + def on_realize(self, widget): + self._pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, self.width, self.height) self.refresh() def set_fg_color(self, color, refresh=True): - """Set the color of the color chooser""" - if self._colormap: - self.fg_color = self._colormap.alloc_color(color) - if refresh: - self.refresh() + if isinstance(color, str): + self.fg_color = Gdk.RGBA() + self.fg_color.parse(color) else: self.fg_color = color + if refresh and self._pixbuf: + self.refresh() def set_bg_color(self, color, refresh=True): - """Set the color of the color chooser""" - if self._colormap: - self.bg_color = self._colormap.alloc_color(color) - if refresh: - self.refresh() + if isinstance(color, str): + self.bg_color = Gdk.RGBA() + self.bg_color.parse(color) else: self.bg_color = color + if refresh and self._pixbuf: + self.refresh() def refresh(self): - self._gc.foreground = self.bg_color - self._pixmap.draw_rectangle(self._gc, True, 0, 0, - self.width, self.height) + if not self._pixbuf: + return + surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, self.width, self.height) + cr = cairo.Context(surface) + if self.bg_color: + Gdk.cairo_set_source_rgba(cr, self.bg_color) + cr.rectangle(0, 0, self.width, self.height) + cr.fill() if self.border: - self._gc.foreground = self._border_color - self._pixmap.draw_rectangle(self._gc, False, 0, 0, - self.width-1, self.height-1) + cr.set_source_rgb(0, 0, 0) + cr.rectangle(0, 0, self.width - 1, self.height - 1) + cr.stroke() + if self.letter and self.fg_color: + layout = PangoCairo.create_layout(cr) + layout.set_text(FONT_LETTER, -1) + fontdesc = Pango.FontDescription("Sans Bold 10") + layout.set_font_description(fontdesc) + cr.set_source_rgba(self.fg_color.red, self.fg_color.green, self.fg_color.blue, self.fg_color.alpha) + cr.move_to(self.marginx, self.marginy) + PangoCairo.show_layout(cr, layout) + self.set_from_pixbuf(GdkPixbuf.Pixbuf.new_from_data(surface.get_data(), GdkPixbuf.Colorspace.RGB, True, 8, self.width, self.height, surface.get_stride())) + + def do_snapshot(self, snapshot): + if self._pixbuf: + texture = Gdk.Texture.new_for_pixbuf(self._pixbuf) + snapshot.append_texture(texture, Gdk.Rectangle(x=0, y=0, width=self.width, height=self.height)) + +# ColorMenu class +class ColorMenu(Gtk.Popover): + def __init__(self, colors=DEFAULT_COLORS): + super().__init__() + self.width = 7 + self.color_items = [] + self.colors = [] - if self.letter: - self._gc.foreground = self.fg_color - layout = pango.Layout(self._context) - layout.set_text(FONT_LETTER) - layout.set_font_description(self._fontdesc) - self._pixmap.draw_layout(self._gc, self.marginx, - self.marginy, - layout) + self.box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=4) + self.set_child(self.box) - self.set_from_pixmap(self._pixmap, None) + # Default color button + no_color_btn = Gtk.Button(label=_("Default Color")) + no_color_btn.connect("clicked", self.on_no_color) + self.box.append(no_color_btn) + # New color button + new_color_btn = Gtk.Button(label=_("New Color...")) + new_color_btn.connect("clicked", self.on_new_color) + self.box.append(new_color_btn) -class ColorMenu (gtk.Menu): - """Color picker menu""" + # Separator + self.box.append(Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)) - def __init__(self, colors=DEFAULT_COLORS): - gtk.Menu.__init__(self) + # Grid for color buttons + self.grid = Gtk.Grid() + self.grid.set_column_spacing(4) + self.grid.set_row_spacing(4) + self.box.append(self.grid) - self.width = 7 - self.posi = 4 - self.posj = 0 - self.color_items = [] - - no_color = gtk.MenuItem("_Default Color") - no_color.show() - no_color.connect("activate", self.on_no_color) - self.attach(no_color, 0, self.width, 0, 1) - - # new color - new_color = gtk.MenuItem("_New Color...") - new_color.show() - new_color.connect("activate", self.on_new_color) - self.attach(new_color, 0, self.width, 1, 2) - - # grab color - #new_color = gtk.MenuItem("_Grab Color") - #new_color.show() - #new_color.connect("activate", self.on_grab_color) - #self.attach(new_color, 0, self.width, 2, 3) - - # separator - item = gtk.SeparatorMenuItem() - item.show() - self.attach(item, 0, self.width, 3, 4) - - # default colors self.set_colors(colors) - def on_new_color(self, menu): - """Callback for new color""" + def on_new_color(self, button): dialog = ColorSelectionDialog("Choose color") dialog.set_modal(True) - dialog.set_transient_for(self.get_toplevel()) # TODO: does this work? - dialog.set_colors(self.colors) - - response = dialog.run() - - if response == gtk.RESPONSE_OK: - color = dialog.colorsel.get_current_color() - color = color_int16_to_str((color.red, color.green, color.blue)) - self.set_colors(dialog.get_colors()) - - # add new color to pallete - if color not in self.colors: - self.colors.append(color) - self.append_color(color) - + dialog.set_transient_for(self.get_root()) # Set parent window + dialog.connect("response", self.on_color_dialog_response) + dialog.present() + + def on_color_dialog_response(self, dialog, response): + if response == Gtk.ResponseType.OK: + color = dialog.get_rgba() + color_str = color_int16_to_str((int(color.red * 65535), + int(color.green * 65535), + int(color.blue * 65535))) + if color_str not in self.colors: + self.colors.append(color_str) + self.append_color(color_str) self.emit("set-colors", self.colors) - self.emit("set-color", color) - + self.emit("set-color", color_str) dialog.destroy() - def on_no_color(self, menu): - """Callback for no color""" + def on_no_color(self, button): self.emit("set-color", None) - def on_grab_color(self, menu): - pass - # TODO: complete - def clear_colors(self): - """Clears color pallete""" - children = set(self.get_children()) - for item in reversed(self.color_items): - if item in children: - self.remove(item) - self.posi = 4 - self.posj = 0 + for item in self.color_items: + self.grid.remove(item) self.color_items = [] self.colors = [] def set_colors(self, colors): - """Sets color pallete""" self.clear_colors() - self.colors = list(colors) - for color in self.colors: - self.append_color(color, False) - - # TODO: add check for visible - # make change visible - self.unrealize() - self.realize() + for i, color in enumerate(colors): + self.append_color(color) - def get_colors(self): - """Returns color pallete""" - return self.colors + def append_color(self, color): + i = len(self.color_items) + row = i // self.width + col = i % self.width + self.add_color(row, col, color) - def append_color(self, color, refresh=True): - """Appends color to menu""" - self.add_color(self.posi, self.posj, color, refresh=refresh) - self.posj += 1 - if self.posj >= self.width: - self.posj = 0 - self.posi += 1 - - def add_color(self, i, j, color, refresh=True): - """Add color to location in the menu""" - if refresh: - self.unrealize() - - child = gtk.MenuItem("") - child.remove(child.child) + def add_color(self, i, j, color): + button = Gtk.Button() img = ColorTextImage(15, 15, False) img.set_bg_color(color) - child.add(img) - child.child.show() - child.show() - child.connect("activate", lambda w: self.emit("set_color", color)) - self.attach(child, j, j+1, i, i+1) - self.color_items.append(child) - - if refresh: - self.realize() - - -gobject.type_register(ColorMenu) -gobject.signal_new("set-color", ColorMenu, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("set-colors", ColorMenu, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("get-colors", ColorMenu, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) - - -#============================================================================= -# color selection ToolBarItem - - -class ColorTool (gtk.MenuToolButton): - """Abstract base class for a ColorTool""" - - def __init__(self, icon, default): - gtk.MenuToolButton.__init__(self, self.icon, "") - self.icon = icon + button.set_child(img) + button.connect("clicked", lambda w: self.emit("set-color", color)) + self.grid.attach(button, j, i, 1, 1) + self.color_items.append(button) + +GObject.type_register(ColorMenu) +GObject.signal_new("set-color", ColorMenu, GObject.SignalFlags.RUN_LAST, None, (GObject.TYPE_PYOBJECT,)) +GObject.signal_new("set-colors", ColorMenu, GObject.SignalFlags.RUN_LAST, None, (GObject.TYPE_PYOBJECT,)) + +# ColorTool base class +class ColorTool(Gtk.MenuButton): + def __init__(self, default): + super().__init__() + self.icon = None self.color = None self.colors = DEFAULT_COLORS self.default = default self.default_set = True - # menu self.menu = ColorMenu([]) self.menu.connect("set-color", self.on_set_color) self.menu.connect("set-colors", self.on_set_colors) - self.set_menu(self.menu) + self.set_popover(self.menu) - self.connect("clicked", self.use_color) - self.connect("show-menu", self.on_show_menu) + self.connect("activate", self.use_color) def on_set_color(self, menu, color): - """Callback from menu when color is set""" - raise Exception("unimplemented") + raise NotImplementedError("Must be implemented by subclass") - def on_set_colors(self, menu, color): - """Callback from menu when pallete is set""" - self.colors = list(self.menu.get_colors()) + def on_set_colors(self, menu, colors): + self.colors = list(colors) self.emit("set-colors", self.colors) def set_colors(self, colors): - """Sets pallete""" self.colors = list(colors) self.menu.set_colors(colors) def get_colors(self): return self.colors - def use_color(self, menu): - """Callback for when button is clicked""" + def use_color(self, widget): self.emit("set-color", self.color) def set_default(self, color): - """Set default color""" self.default = color if self.default_set: self.icon.set_fg_color(self.default) def on_show_menu(self, widget): - """Callback for when menu is displayed""" self.emit("get-colors") self.menu.set_colors(self.colors) +GObject.type_register(ColorTool) +GObject.signal_new("set-color", ColorTool, GObject.SignalFlags.RUN_LAST, None, (GObject.TYPE_PYOBJECT,)) +GObject.signal_new("set-colors", ColorTool, GObject.SignalFlags.RUN_LAST, None, (GObject.TYPE_PYOBJECT,)) +GObject.signal_new("get-colors", ColorTool, GObject.SignalFlags.RUN_LAST, None, ()) -gobject.type_register(ColorTool) -gobject.signal_new("set-color", ColorTool, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("set-colors", ColorTool, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("get-colors", ColorTool, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) - - -class FgColorTool (ColorTool): - """ToolItem for choosing the foreground color""" - +# FgColorTool class +class FgColorTool(ColorTool): def __init__(self, width, height, default): self.icon = ColorTextImage(width, height, True, True) self.icon.set_fg_color(default) self.icon.set_bg_color("#ffffff") - ColorTool.__init__(self, self.icon, default) + super().__init__(default) + self.set_child(self.icon) def on_set_color(self, menu, color): - """Callback from menu""" if color is None: self.default_set = True self.icon.set_fg_color(self.default) else: self.default_set = False self.icon.set_fg_color(color) - self.color = color self.emit("set-color", color) - -class BgColorTool (ColorTool): - """ToolItem for choosing the backgroundground color""" - +# BgColorTool class +class BgColorTool(ColorTool): def __init__(self, width, height, default): self.icon = ColorTextImage(width, height, False, True) self.icon.set_bg_color(default) - ColorTool.__init__(self, self.icon, default) + super().__init__(default) + self.set_child(self.icon) def on_set_color(self, menu, color): - """Callback from menu""" if color is None: self.default_set = True self.icon.set_bg_color(self.default) else: self.default_set = False self.icon.set_bg_color(color) - self.color = color self.emit("set-color", color) +# ColorSelectionDialog class +class ColorSelectionDialog(Gtk.ColorChooserDialog): + def __init__(self, title="Choose color"): + super().__init__(title=title) + self.set_use_alpha(False) -#============================================================================= -# color selection dialog and pallete + main_vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) + self.get_content_area().append(main_vbox) + label = Gtk.Label(label=_("Palette:")) + label.set_halign(Gtk.Align.START) + main_vbox.append(label) -class ColorSelectionDialog (gtk.ColorSelectionDialog): + self.palette = ColorPalette(DEFAULT_COLORS) + self.palette.connect("pick-color", self.on_pick_palette_color) + main_vbox.append(self.palette) - def __init__(self, title="Choose color"): - gtk.ColorSelectionDialog.__init__(self, title) - self.colorsel.set_has_opacity_control(False) - - # hide default gtk pallete - self.colorsel.set_has_palette(False) - - # structure of ColorSelection widget - # colorsel = VBox(HBox(selector, VBox(Table, VBox(Label, pallete), - # my_pallete))) - # pallete = Table(Frame(DrawingArea), ...) - # - #vbox = (self.colorsel.get_children()[0] - # .get_children()[1].get_children()[1]) - #pallete = vbox.get_children()[1] - - vbox = self.colorsel.get_children()[0].get_children()[1] - - # label - label = gtk.Label(_("Pallete:")) - label.set_alignment(0, .5) - label.show() - vbox.pack_start(label, expand=False, fill=True, padding=0) - - # pallete - self.pallete = ColorPallete(DEFAULT_COLORS) - self.pallete.connect("pick-color", self.on_pick_pallete_color) - self.pallete.show() - vbox.pack_start(self.pallete, expand=False, fill=True, padding=0) - - # pallete buttons - hbox = gtk.HButtonBox() - hbox.show() - vbox.pack_start(hbox, expand=False, fill=True, padding=0) - - # new color - button = gtk.Button("new", stock=gtk.STOCK_NEW) - button.set_relief(gtk.RELIEF_NONE) - button.connect("clicked", self.on_new_color) - button.show() - hbox.pack_start(button, expand=False, fill=False, padding=0) - - # delete color - button = gtk.Button("delete", stock=gtk.STOCK_DELETE) - button.set_relief(gtk.RELIEF_NONE) - button.connect("clicked", self.on_delete_color) - button.show() - hbox.pack_start(button, expand=False, fill=False, padding=0) - - # reset colors - button = gtk.Button(stock=gtk.STOCK_UNDO) - (button.get_children()[0].get_child() - .get_children()[1].set_text_with_mnemonic("_Reset")) - button.set_relief(gtk.RELIEF_NONE) - button.connect("clicked", self.on_reset_colors) - button.show() - hbox.pack_start(button, expand=False, fill=False, padding=0) - - # colorsel signals - def func(w): - color = self.colorsel.get_current_color() - self.pallete.set_color( - color_int16_to_str((color.red, color.green, color.blue))) - self.colorsel.connect("color-changed", func) + hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) + main_vbox.append(hbox) + + new_button = Gtk.Button(label="New") + new_button.connect("clicked", self.on_new_color) + hbox.append(new_button) + + delete_button = Gtk.Button(label="Delete") + delete_button.connect("clicked", self.on_delete_color) + hbox.append(delete_button) + + reset_button = Gtk.Button(label="_Reset") + reset_button.connect("clicked", self.on_reset_colors) + hbox.append(reset_button) + + self.connect("notify::rgba", self.on_color_changed) def set_colors(self, colors): - """Set pallete colors""" - self.pallete.set_colors(colors) + self.palette.set_colors(colors) def get_colors(self): - """Get pallete colors""" - return self.pallete.get_colors() + return self.palette.get_colors() - def on_pick_pallete_color(self, widget, color): - self.colorsel.set_current_color(gtk.gdk.Color(color)) + def on_pick_palette_color(self, widget, color): + rgba = Gdk.RGBA() + rgba.parse(color) + self.set_rgba(rgba) def on_new_color(self, widget): - color = self.colorsel.get_current_color() - self.pallete.new_color( - color_int16_to_str((color.red, color.green, color.blue))) + color = self.get_rgba() + color_str = color_int16_to_str((int(color.red * 65535), int(color.green * 65535), int(color.blue * 65535))) + self.palette.new_color(color_str) def on_delete_color(self, widget): - self.pallete.remove_selected() + self.palette.remove_selected() def on_reset_colors(self, widget): - self.pallete.set_colors(DEFAULT_COLORS) + self.palette.set_colors(DEFAULT_COLORS) + def on_color_changed(self, widget, pspec): + color = self.get_rgba() + color_str = color_int16_to_str((int(color.red * 65535), int(color.green * 65535), int(color.blue * 65535))) + self.palette.set_color(color_str) -class ColorPallete (gtk.IconView): +# ColorPalette class +class ColorPalette(Gtk.FlowBox): def __init__(self, colors=DEFAULT_COLORS, nrows=1, ncols=7): - gtk.IconView.__init__(self) - self._model = gtk.ListStore(gtk.gdk.Pixbuf, object) + super().__init__() + self._model = Gtk.ListStore(GdkPixbuf.Pixbuf, GObject.TYPE_STRING) self._cell_size = [30, 20] - self.set_model(self._model) - self.set_reorderable(True) - self.set_property("columns", 7) - self.set_property("spacing", 0) - self.set_property("column-spacing", 0) - self.set_property("row-spacing", 0) - self.set_property("item-padding", 1) - self.set_property("margin", 1) - self.set_pixbuf_column(0) - - self.connect("selection-changed", self._on_selection_changed) + self.set_max_children_per_line(ncols) + self.set_column_spacing(0) + self.set_row_spacing(0) + self.set_homogeneous(True) + self.connect("child-activated", self._on_selection_changed) self.set_colors(colors) - # TODO: could ImageColorText become a DrawingArea widget? - def clear_colors(self): - """Clears all colors from pallete""" - self._model.clear() + for child in self.get_children(): + self.remove(child) def set_colors(self, colors): - """Sets colors in pallete""" self.clear_colors() for color in colors: self.append_color(color) def get_colors(self): - """Returns colors in pallete""" colors = [] - self._model.foreach( - lambda m, p, i: colors.append(m.get_value(i, 1))) + self._model.foreach(lambda model, path, iter: colors.append(model.get_value(iter, 1))) return colors def append_color(self, color): - """Append color to pallete""" width, height = self._cell_size - - # make pixbuf - pixbuf = gtk.gdk.Pixbuf( - gtk.gdk.COLORSPACE_RGB, False, 8, width, height) + pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, width, height) self._draw_color(pixbuf, color, 0, 0, width, height) - self._model.append([pixbuf, color]) + image = Gtk.Image.new_from_pixbuf(pixbuf) + self.append(image) def remove_selected(self): - """Remove selected color""" - for path in self.get_selected_items(): - self._model.remove(self._model.get_iter(path)) + selected = self.get_selected_children() + if selected: + path = self._model.get_path(self._model.get_iter_first()) + for i, child in enumerate(self.get_children()): + if child in selected: + self._model.remove(self._model.get_iter(path[i])) + self.remove(child) + break def new_color(self, color): - """Adds a new color""" self.append_color(color) - n = self._model.iter_n_children(None) - self.select_path((n-1,)) + n = self._model.iter_n_children() + self.select_child(self.get_child_at_index(n - 1)) def set_color(self, color): - """Sets the color of the selected cell""" width, height = self._cell_size - - it = self._get_selected_iter() - if it: - pixbuf = self._model.get_value(it, 0) + selected = self.get_selected_children() + if selected: + child = selected[0] + pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, width, height) self._draw_color(pixbuf, color, 0, 0, width, height) - self._model.set_value(it, 1, color) - - def _get_selected_iter(self): - """Returns the selected cell (TreeIter)""" - for path in self.get_selected_items(): - return self._model.get_iter(path) - return None - - def _on_selection_changed(self, view): - """Callback for when selection changes""" - it = self._get_selected_iter() - if it: - color = self._model.get_value(it, 1) - self.emit("pick-color", color) + child.get_first_child().set_from_pixbuf(pixbuf) + it = self._model.get_iter_first() + for i, c in enumerate(self.get_children()): + if c == child: + self._model.set_value(it, 1, color) + break + it = self._model.iter_next(it) + + def _on_selection_changed(self, flowbox, child): + it = self._model.get_iter_first() + for i, c in enumerate(self.get_children()): + if c == child: + color = self._model.get_value(it, 1) + self.emit("pick-color", color) + break + it = self._model.iter_next(it) def _draw_color(self, pixbuf, color, x, y, width, height): - """Draws a color cell""" - border_color = "#000000" - - # create pixmap - pixmap = gdk.Pixmap(None, width, height, 24) - cmap = pixmap.get_colormap() - gc = pixmap.new_gc() - color1 = cmap.alloc_color(color) - color2 = cmap.alloc_color(border_color) - - # draw fill - gc.foreground = color1 # gtk.gdk.Color(* color) - pixmap.draw_rectangle(gc, True, 0, 0, width, height) - - # draw border - gc.foreground = color2 # gtk.gdk.Color(* border_color) - pixmap.draw_rectangle(gc, False, 0, 0, width-1, height-1) - - pixbuf.get_from_drawable(pixmap, cmap, 0, 0, 0, 0, width, height) - - -gobject.type_register(ColorPallete) -gobject.signal_new("pick-color", ColorPallete, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) + surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + cr = cairo.Context(surface) + rgba = Gdk.RGBA() + rgba.parse(color) + Gdk.cairo_set_source_rgba(cr, rgba) + cr.rectangle(x, y, width, height) + cr.fill() + cr.set_source_rgb(0, 0, 0) + cr.rectangle(x, y, width - 1, height - 1) + cr.stroke() + pixbuf.get_pixels()[:] = surface.get_data() + +GObject.type_register(ColorPalette) +GObject.signal_new("pick-color", ColorPalette, GObject.SignalFlags.RUN_LAST, None, (GObject.TYPE_STRING,)) + +# Example usage (optional) +if __name__ == "__main__": + win = Gtk.Window() + box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + fg_tool = FgColorTool(20, 20, "#000000") + bg_tool = BgColorTool(20, 20, "#ffffff") + box.append(fg_tool) + box.append(bg_tool) + win.set_child(box) + win.connect("destroy", Gtk.main_quit) + win.show() + Gtk.main() \ No newline at end of file diff --git a/keepnote/gui/dialog_app_options.py b/keepnote/gui/dialog_app_options.py index 4647d9b1d..f603614d2 100644 --- a/keepnote/gui/dialog_app_options.py +++ b/keepnote/gui/dialog_app_options.py @@ -1,307 +1,188 @@ -""" - - KeepNote - Application Options Dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python 3 and PyGObject imports import os - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade -from gtk import gdk - -# keepnote imports +import gi +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, Gdk, GdkPixbuf import keepnote -from keepnote import unicode_gtk -from keepnote import get_resource +from keepnote.util.platform import unicode_gtk +from keepnote.util.platform import get_resource from keepnote.gui.font_selector import FontSelector import keepnote.gui from keepnote.gui.icons import get_icon_filename import keepnote.trans import keepnote.gui.extension -_ = keepnote.translate - +# 修改为从 util.perform 直接导入 +from keepnote.util.platform import translate +_ = translate -def on_browse(parent, title, filename, entry, - action=gtk.FILE_CHOOSER_ACTION_OPEN): - """Callback for selecting file browser associated with a text entry""" - - dialog = gtk.FileChooserDialog( - title, parent, +def on_browse(parent, title, filename, entry, action=Gtk.FileChooserAction.OPEN): + dialog = Gtk.FileChooserDialog( + title=title, + parent=parent, action=action, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("Open"), gtk.RESPONSE_OK)) + ) + dialog.add_button(_("Cancel"), Gtk.ResponseType.CANCEL) + dialog.add_button(_("Open"), Gtk.ResponseType.OK) dialog.set_transient_for(parent) dialog.set_modal(True) - # set the filename if it is fully specified if filename == "": filename = entry.get_text() if os.path.isabs(filename): dialog.set_filename(filename) - if dialog.run() == gtk.RESPONSE_OK and dialog.get_filename(): + if dialog.run() == Gtk.ResponseType.OK and dialog.get_filename(): entry.set_text(dialog.get_filename()) dialog.destroy() - -class Section (object): - """A Section in the Options Dialog""" - - def __init__(self, key, dialog, app, label=u"", icon=None): +class Section: + def __init__(self, key, dialog, app, label="", icon=None): self.key = key self.dialog = dialog self.label = label self.icon = icon - self.frame = gtk.Frame("") - self.frame.get_label_widget().set_text("%s" % label) + self.frame = Gtk.Frame(label=f"{label}") self.frame.get_label_widget().set_use_markup(True) - self.frame.set_property("shadow-type", gtk.SHADOW_NONE) - self.__align = gtk.Alignment() - self.__align.set_padding(10, 0, 10, 0) - self.__align.show() - self.frame.add(self.__align) + self._box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10) + self._box.set_margin_start(10) + self._box.set_margin_end(10) + self._box.set_margin_top(10) + self.frame.set_child(self._box) def get_default_widget(self): - """Returns the default parent widget for a Section""" - return self.__align + return self._box def load_options(self, app): - """Load options from app to UI""" pass def save_options(self, app): - """Save options to the app""" pass +class GeneralSection(Section): + def __init__(self, key, dialog, app, label="", icon="keepnote.py-16x16.png"): + super().__init__(key, dialog, app, label, icon) + self.notebook = None -class GeneralSection (Section): + self.xml = Gtk.Builder() + self.xml.add_from_file(get_resource("rc", "keepnote.py.ui")) + self.xml.set_translation_domain(keepnote.GETTEXT_DOMAIN) + self.frame = self.xml.get_object("general_frame") - def __init__(self, key, dialog, app, - label=u"", icon="keepnote-16x16.png"): - Section.__init__(self, key, dialog, app, label, icon) + default_notebook_button = self.xml.get_object("default_notebook_button") + default_notebook_button.connect("clicked", self.on_default_notebook_button_clicked) - self.notebook = None + systray_check = self.xml.get_object("systray_check") + systray_check.connect("toggled", self.on_systray_check_toggled) - self.xml = gtk.glade.XML(get_resource("rc", "keepnote.glade"), - "general_frame", keepnote.GETTEXT_DOMAIN) - self.xml.signal_autoconnect(self) - self.xml.signal_autoconnect({ - "on_default_notebook_button_clicked": - lambda w: on_browse( - self.dialog, - _("Choose Default Notebook"), - "", - self.xml.get_widget("default_notebook_entry")), - }) - self.frame = self.xml.get_widget("general_frame") + default_radio = self.xml.get_object("default_notebook_radio") + default_radio.connect("toggled", self.on_default_notebook_radio_changed) def on_default_notebook_radio_changed(self, radio): - """Default notebook radio changed""" - default = self.xml.get_widget("default_notebook_radio") - default_tab = self.xml.get_widget("default_notebook_table") + default = self.xml.get_object("default_notebook_radio") + default_tab = self.xml.get_object("default_notebook_table") default_tab.set_sensitive(default.get_active()) def on_autosave_check_toggled(self, widget): - """The autosave option controls sensitivity of autosave time""" - self.xml.get_widget("autosave_entry").set_sensitive( - widget.get_active()) - self.xml.get_widget("autosave_label").set_sensitive( - widget.get_active()) + self.xml.get_object("autosave_entry").set_sensitive(widget.get_active()) + self.xml.get_object("autosave_label").set_sensitive(widget.get_active()) - def on_systray_check_toggled(self, widget): - """Systray option controls sensitivity of sub-options""" - self.xml.get_widget("skip_taskbar_check").set_sensitive( - widget.get_active()) - self.xml.get_widget("minimize_on_start_check").set_sensitive( - widget.get_active()) + def on_default_notebook_button_clicked(self, widget): + on_browse(self.dialog, _("Choose Default Notebook"), "", self.xml.get_object("default_notebook_entry")) - def on_set_default_notebook_button_clicked(self, widget): - if self.notebook: - self.xml.get_widget("default_notebook_entry").set_text( - self.notebook.get_path()) + def on_systray_check_toggled(self, widget): + self.xml.get_object("skip_taskbar_check").set_sensitive(widget.get_active()) + self.xml.get_object("minimize_on_start_check").set_sensitive(widget.get_active()) def load_options(self, app): - win = app.get_current_window() if win: self.notebook = win.get_notebook() - # populate default notebook if app.pref.get("use_last_notebook", default=True): - self.xml.get_widget("last_notebook_radio").set_active(True) + self.xml.get_object("last_notebook_radio").set_active(True) elif app.pref.get("default_notebooks", default=[]) == []: - self.xml.get_widget("no_default_notebook_radio").set_active(True) + self.xml.get_object("no_default_notebook_radio").set_active(True) else: - self.xml.get_widget("default_notebook_radio").set_active(True) - self.xml.get_widget("default_notebook_entry").\ - set_text( - (app.pref.get("default_notebooks", default=[]) + [""])[0] - ) - - # populate autosave - self.xml.get_widget("autosave_check").set_active( - app.pref.get("autosave")) - self.xml.get_widget("autosave_entry").set_text( - str(int(app.pref.get("autosave_time") / 1000))) - - self.xml.get_widget("autosave_entry").set_sensitive( - app.pref.get("autosave")) - self.xml.get_widget("autosave_label").set_sensitive( - app.pref.get("autosave")) - - # use systray icon - self.xml.get_widget("systray_check").set_active( - app.pref.get("window", "use_systray")) - self.xml.get_widget("skip_taskbar_check").set_active( - app.pref.get("window", "skip_taskbar")) - self.xml.get_widget("skip_taskbar_check").set_sensitive( - app.pref.get("window", "use_systray")) - - self.xml.get_widget("minimize_on_start_check").set_active( - app.pref.get("window", "minimize_on_start")) - self.xml.get_widget("minimize_on_start_check").set_sensitive( - app.pref.get("window", "use_systray")) - - self.xml.get_widget("window_keep_above_check").set_active( - app.pref.get("window", "keep_above")) - - # set window 'always on top' - self.xml.get_widget("window_stick_check").set_active( - app.pref.get("window", "stick")) - - self.xml.get_widget("use_fulltext_check").set_active( - app.pref.get("use_fulltext_search", default=True)) + self.xml.get_object("default_notebook_radio").set_active(True) + self.xml.get_object("default_notebook_entry").set_text( + (app.pref.get("default_notebooks", default=[]) + [""])[0]) + + self.xml.get_object("autosave_check").set_active(app.pref.get("autosave")) + self.xml.get_object("autosave_entry").set_text(str(int(app.pref.get("autosave_time") / 1000))) + self.xml.get_object("autosave_entry").set_sensitive(app.pref.get("autosave")) + self.xml.get_object("autosave_label").set_sensitive(app.pref.get("autosave")) + + self.xml.get_object("systray_check").set_active(app.pref.get("window", "use_systray")) + self.xml.get_object("skip_taskbar_check").set_active(app.pref.get("window", "skip_taskbar")) + self.xml.get_object("skip_taskbar_check").set_sensitive(app.pref.get("window", "use_systray")) + self.xml.get_object("minimize_on_start_check").set_active(app.pref.get("window", "minimize_on_start")) + self.xml.get_object("minimize_on_start_check").set_sensitive(app.pref.get("window", "use_systray")) + self.xml.get_object("window_keep_above_check").set_active(app.pref.get("window", "keep_above")) + self.xml.get_object("window_stick_check").set_active(app.pref.get("window", "stick")) + self.xml.get_object("use_fulltext_check").set_active(app.pref.get("use_fulltext_search", default=True)) def save_options(self, app): - if self.xml.get_widget("last_notebook_radio").get_active(): + if self.xml.get_object("last_notebook_radio").get_active(): app.pref.set("use_last_notebook", True) - elif self.xml.get_widget("default_notebook_radio").get_active(): + elif self.xml.get_object("default_notebook_radio").get_active(): app.pref.set("use_last_notebook", False) - app.pref.set("default_notebooks", - [unicode_gtk( - self.xml.get_widget( - "default_notebook_entry").get_text())]) + app.pref.set("default_notebooks", [unicode_gtk(self.xml.get_object("default_notebook_entry").get_text())]) else: app.pref.set("use_last_notebook", False) app.pref.set("default_notebooks", []) - # save autosave - app.pref.set("autosave", - self.xml.get_widget("autosave_check").get_active()) + app.pref.set("autosave", self.xml.get_object("autosave_check").get_active()) try: - app.pref.set( - "autosave_time", - int(self.xml.get_widget("autosave_entry").get_text()) * 1000) + app.pref.set("autosave_time", int(self.xml.get_object("autosave_entry").get_text()) * 1000) except: pass - # use systray icon - app.pref.set("window", "use_systray", - self.xml.get_widget("systray_check").get_active()) - app.pref.set("window", "skip_taskbar", - self.xml.get_widget("skip_taskbar_check").get_active()) - - app.pref.set( - "window", "minimize_on_start", - self.xml.get_widget("minimize_on_start_check").get_active()) - - # window 'always above' - app.pref.set( - "window", "keep_above", - self.xml.get_widget("window_keep_above_check").get_active()) - - # window 'stick to all desktops' - app.pref.set( - "window", "stick", - self.xml.get_widget("window_stick_check").get_active()) - - app.pref.set( - "use_fulltext_search", - self.xml.get_widget("use_fulltext_check").get_active()) - - -class LookAndFeelSection (Section): - - def __init__(self, key, dialog, app, label=u"", icon="lookandfeel.png"): - Section.__init__(self, key, dialog, app, label, icon) + app.pref.set("window", "use_systray", self.xml.get_object("systray_check").get_active()) + app.pref.set("window", "skip_taskbar", self.xml.get_object("skip_taskbar_check").get_active()) + app.pref.set("window", "minimize_on_start", self.xml.get_object("minimize_on_start_check").get_active()) + app.pref.set("window", "keep_above", self.xml.get_object("window_keep_above_check").get_active()) + app.pref.set("window", "stick", self.xml.get_object("window_stick_check").get_active()) + app.pref.set("use_fulltext_search", self.xml.get_object("use_fulltext_check").get_active()) +class LookAndFeelSection(Section): + def __init__(self, key, dialog, app, label="", icon="lookandfeel.png"): + super().__init__(key, dialog, app, label, icon) w = self.get_default_widget() - v = gtk.VBox(False, 5) - v.show() - w.add(v) + v = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) def add_check(label): - c = gtk.CheckButton(label) - c.show() - v.pack_start(c, False, False, 0) + c = Gtk.CheckButton(label=label) + v.append(c) return c - self.treeview_lines_check = add_check( - _("show lines in treeview")) - self.listview_rules_check = add_check( - _("use ruler hints in listview")) - self.use_stock_icons_check = add_check( - _("use GTK stock icons in toolbar")) - self.use_minitoolbar = add_check( - _("use minimal toolbar")) + self.treeview_lines_check = add_check(_("show lines in treeview")) + self.listview_rules_check = add_check(_("use ruler hints in listview")) + self.use_stock_icons_check = add_check(_("use GTK stock icons in toolbar")) + self.use_minitoolbar = add_check(_("use minimal toolbar")) - # app font size font_size = 10 - h = gtk.HBox(False, 5) - h.show() - l = gtk.Label(_("Application Font Size:")) - l.show() - h.pack_start(l, False, False, 0) - self.app_font_size = gtk.SpinButton( - gtk.Adjustment(value=font_size, lower=2, upper=500, step_incr=1)) + h = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5) + l = Gtk.Label(label=_("Application Font Size:")) + h.append(l) + self.app_font_size = Gtk.SpinButton.new_with_range(2, 500, 1) self.app_font_size.set_value(font_size) - #font_size_button.set_editable(False) - self.app_font_size.show() - h.pack_start(self.app_font_size, False, False, 0) - v.pack_start(h, False, False, 0) - - # view mode combo - h = gtk.HBox(False, 5) - h.show() - l = gtk.Label(_("Listview Layout:")) - l.show() - h.pack_start(l, False, False, 0) - c = gtk.combo_box_new_text() - c.show() - c.append_text(_("Vertical")) - c.append_text(_("Horizontal")) - h.pack_start(c, False, False, 0) - v.pack_start(h) + h.append(self.app_font_size) + v.append(h) + + h = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5) + l = Gtk.Label(label=_("Listview Layout:")) + h.append(l) + c = Gtk.DropDown.new_from_strings(["Vertical", "Horizontal"]) + h.append(c) + v.append(h) self.listview_layout = c + w.append(v) + def load_options(self, app): l = app.pref.get("look_and_feel") self.treeview_lines_check.set_active(l.get("treeview_lines")) @@ -310,14 +191,12 @@ def load_options(self, app): self.use_minitoolbar.set_active(l.get("use_minitoolbar")) self.app_font_size.set_value(l.get("app_font_size")) - if app.pref.get("viewers", "three_pane_viewer", - "view_mode", default="") == "horizontal": - self.listview_layout.set_active(1) + if app.pref.get("viewers", "three_pane_viewer", "view_mode", default="") == "horizontal": + self.listview_layout.set_selected(1) else: - self.listview_layout.set_active(0) + self.listview_layout.set_selected(0) def save_options(self, app): - l = app.pref.get("look_and_feel") l["treeview_lines"] = self.treeview_lines_check.get_active() l["listview_rules"] = self.listview_rules_check.get_active() @@ -326,187 +205,133 @@ def save_options(self, app): l["app_font_size"] = self.app_font_size.get_value() app.pref.set("viewers", "three_pane_viewer", "view_mode", - ["vertical", "horizontal"][ - self.listview_layout.get_active()]) - - -class LanguageSection (Section): - - def __init__(self, key, dialog, app, label=u"", icon=None): - Section.__init__(self, key, dialog, app, label, icon) + ["vertical", "horizontal"][self.listview_layout.get_selected()]) +class LanguageSection(Section): + def __init__(self, key, dialog, app, label="", icon=None): + super().__init__(key, dialog, app, label, icon) w = self.get_default_widget() - v = gtk.VBox(False, 5) - v.show() - w.add(v) - - # language combo - h = gtk.HBox(False, 5) - h.show() - l = gtk.Label(_("Language:")) - l.show() - h.pack_start(l, False, False, 0) - c = gtk.combo_box_new_text() - c.show() - - # populate language options - c.append_text("default") - for lang in keepnote.trans.get_langs(): - c.append_text(lang) - - # pack combo - h.pack_start(c, False, False, 0) - v.pack_start(h) + v = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) + + h = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5) + l = Gtk.Label(label=_("Language:")) + h.append(l) + c = Gtk.DropDown.new_from_strings(["default"] + keepnote.trans.get_langs()) + h.append(c) + v.append(h) self.language_box = c + w.append(v) + def load_options(self, app): lang = app.pref.get("language", default="") - - # set default if lang == "": - self.language_box.set_active(0) + self.language_box.set_selected(0) else: - for i, row in enumerate(self.language_box.get_model()): - if lang == row[0]: - self.language_box.set_active(i) + for i, l in enumerate(["default"] + keepnote.trans.get_langs()): + if lang == l: + self.language_box.set_selected(i) break def save_options(self, app): - if self.language_box.get_active() > 0: - app.pref.set("language", self.language_box.get_active_text()) + if self.language_box.get_selected() > 0: + app.pref.set("language", self.language_box.get_model().get_string(self.language_box.get_selected())) else: - # set default app.pref.set("language", "") - -class HelperAppsSection (Section): - - def __init__(self, key, dialog, app, label=u"", icon=None): - Section.__init__(self, key, dialog, app, label, icon) - +class HelperAppsSection(Section): + def __init__(self, key, dialog, app, label="", icon=None): + super().__init__(key, dialog, app, label, icon) self.entries = {} w = self.get_default_widget() + self.table = Gtk.Grid() + w.append(self.table) - self.table = gtk.Table(max(len(list(app.iter_external_apps())), 1), 2) - self.table.show() - w.add(self.table) - - # set icon try: - self.icon = keepnote.gui.get_pixbuf( - get_icon_filename(gtk.STOCK_EXECUTE), size=(15, 15)) + self.icon = keepnote.gui.get_pixbuf(get_icon_filename("system-run"), size=(15, 15)) except: pass def load_options(self, app): + for child in self.table.get_children(): + self.table.remove(child) + apps = list(app.iter_external_apps()) + self.table.set_row_spacing(2) + self.table.set_column_spacing(2) - # clear table, resize - self.table.foreach(lambda x: self.table.remove(x)) - self.table.resize(len(list(app.iter_external_apps())), 2) - - for i, app in enumerate(app.iter_external_apps()): + for i, app in enumerate(apps): key = app.key app_title = app.title prog = app.prog - # program label - label = gtk.Label(app_title + ":") - label.set_justify(gtk.JUSTIFY_RIGHT) - label.set_alignment(1.0, 0.5) - label.show() - self.table.attach(label, 0, 1, i, i+1, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) - - # program entry - entry = gtk.Entry() + label = Gtk.Label(label=f"{app_title}:") + label.set_halign(Gtk.Align.END) + self.table.attach(label, 0, i, 1, 1) + + entry = Gtk.Entry() entry.set_text(prog) entry.set_width_chars(30) - entry.show() self.entries[key] = entry - self.table.attach(entry, 1, 2, i, i+1, - xoptions=gtk.FILL | gtk.EXPAND, yoptions=0, - xpadding=2, ypadding=2) - - # browse button - def button_clicked(key, title, prog): - return lambda w: \ - on_browse(self.dialog, - _("Choose %s") % title, - "", self.entries[key]) - button = gtk.Button(_("Browse...")) - button.set_image( - gtk.image_new_from_stock(gtk.STOCK_OPEN, - gtk.ICON_SIZE_SMALL_TOOLBAR)) - button.show() - button.connect("clicked", button_clicked(key, app_title, prog)) - self.table.attach(button, 2, 3, i, i+1, - xoptions=0, yoptions=0, - xpadding=2, ypadding=2) + self.table.attach(entry, 1, i, 1, 1) - def save_options(self, app): - - # TODO: use a public interface + button = Gtk.Button(label=_("Browse...")) + button.set_icon_name("document-open") + button.connect("clicked", lambda w, k=key, t=app_title: on_browse(self.dialog, _("Choose %s") % t, "", self.entries[k])) + self.table.attach(button, 2, i, 1, 1) - # save external app options + def save_options(self, app): apps = app.pref.get("external_apps", default=[]) - for app in apps: key = app.get("key", None) - if key: - entry = self.entries.get(key, None) - if entry: - app["prog"] = unicode_gtk(entry.get_text()) + if key and key in self.entries: + app["prog"] = unicode_gtk(self.entries[key].get_text()) - -class DatesSection (Section): - - def __init__(self, key, dialog, app, label=u"", icon="time.png"): - Section.__init__(self, key, dialog, app, label, icon) - - self.date_xml = gtk.glade.XML( - get_resource("rc", "keepnote.glade"), - "date_time_frame", keepnote.GETTEXT_DOMAIN) - self.date_xml.signal_autoconnect(self) - self.frame = self.date_xml.get_widget("date_time_frame") +class DatesSection(Section): + def __init__(self, key, dialog, app, label="", icon=None): + super().__init__(key, dialog, app, label, icon) + self.xml = Gtk.Builder() + try: + glade_file = get_resource("rc", "keepnote.py.ui") + print(f"Loading GLADE file for DatesSection: {glade_file}") + self.xml.add_from_file(glade_file) + except Exception as e: + print(f"Failed to load GLADE file for DatesSection: {e}") + self.frame = Gtk.Frame(label=f"{label}") + self.frame.get_label_widget().set_use_markup(True) + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10) + box.set_margin_start(10) + box.set_margin_end(10) + box.set_margin_top(10) + box.append(Gtk.Label(label="DatesSection Placeholder")) + self.frame.set_child(box) + + self.frame = self.xml.get_object("dates_frame") or self.frame def load_options(self, app): for name in ["same_day", "same_month", "same_year", "diff_year"]: - self.date_xml.get_widget("date_%s_entry" % name).\ - set_text(app.pref.get("timestamp_formats", name)) + self.xml.get_object(f"date_{name}_entry").set_text(app.pref.get("timestamp_formats", name)) def save_options(self, app): - # save date formatting for name in ["same_day", "same_month", "same_year", "diff_year"]: - app.pref.set("timestamp_formats", name, unicode_gtk( - self.date_xml.get_widget("date_%s_entry" % name).get_text())) - - -class EditorSection (Section): - - def __init__(self, key, dialog, app, label=u"", icon=None): - Section.__init__(self, key, dialog, app, label, icon) + app.pref.set("timestamp_formats", name, unicode_gtk(self.xml.get_object(f"date_{name}_entry").get_text())) +class EditorSection(Section): + def __init__(self, key, dialog, app, label="", icon=None): + super().__init__(key, dialog, app, label, icon) w = self.get_default_widget() - v = gtk.VBox(False, 5) - v.show() - w.add(v) - - # language combo - h = gtk.HBox(False, 5) - h.show() - l = gtk.Label(_("Quote format:")) - l.show() - h.pack_start(l, False, False, 0) - e = gtk.Entry() - e.show() - e.set_width_chars(40) + v = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) - # pack entry - h.pack_start(e, False, False, 0) - v.pack_start(h) + h = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5) + l = Gtk.Label(label=_("Quote format:")) + h.append(l) + e = Gtk.Entry() + e.set_width_chars(40) + h.append(e) + v.append(h) self.quote_format = e + w.append(v) + def load_options(self, app): try: quote_format = app.pref.get("editors", "general", "quote_format") @@ -519,149 +344,87 @@ def save_options(self, app): if quote_format: app.pref.set("editors", "general", "quote_format", quote_format) - -class AllNoteBooksSection (Section): - - def __init__(self, key, dialog, app, label=u"", icon="folder.png"): - Section.__init__(self, key, dialog, app, label, icon) - +class AllNoteBooksSection(Section): + def __init__(self, key, dialog, app, label="", icon="folder.png"): + super().__init__(key, dialog, app, label, icon) w = self.get_default_widget() - l = gtk.Label( - _("This section contains options that are saved on a per " - "notebook basis (e.g. notebook-specific font). A " - "subsection will appear for each notebook that is " - "currently opened.")) - l.set_line_wrap(True) - w.add(l) - w.show_all() - - -class NoteBookSection (Section): - - def __init__(self, key, dialog, app, notebook, label=u"", - icon="folder.png"): - Section.__init__(self, key, dialog, app, label, icon) - self.entries = {} + l = Gtk.Label(label=_("This section contains options that are saved on a per notebook basis (e.g. notebook-specific font). A subsection will appear for each notebook that is currently opened.")) + l.set_wrap(True) + w.append(l) +class NoteBookSection(Section): + def __init__(self, key, dialog, app, notebook, label="", icon="folder.png"): + super().__init__(key, dialog, app, label, icon) self.notebook = notebook - # add notebook font widget - self.notebook_xml = gtk.glade.XML( - get_resource("rc", "keepnote.glade"), - "notebook_frame", keepnote.GETTEXT_DOMAIN) - self.notebook_xml.signal_autoconnect(self) - self.frame = self.notebook_xml.get_widget("notebook_frame") + self.notebook_xml = Gtk.Builder() + self.notebook_xml.add_from_file(get_resource("rc", "keepnote.py.ui")) + self.notebook_xml.set_translation_domain(keepnote.GETTEXT_DOMAIN) + self.frame = self.notebook_xml.get_object("notebook_frame") - notebook_font_spot = self.notebook_xml.get_widget("notebook_font_spot") + notebook_font_spot = self.notebook_xml.get_object("notebook_font_spot") self.notebook_font_family = FontSelector() - notebook_font_spot.add(self.notebook_font_family) - self.notebook_font_family.show() + notebook_font_spot.append(self.notebook_font_family) - # populate notebook font - self.notebook_font_size = self.notebook_xml.get_widget( - "notebook_font_size") + self.notebook_font_size = self.notebook_xml.get_object("notebook_font_size") self.notebook_font_size.set_value(10) - self.notebook_index_dir = self.notebook_xml.get_widget( - "index_dir_entry") - self.notebook_xml.get_widget("index_dir_browse").connect( - "clicked", - lambda w: on_browse( - self.dialog, - _("Choose alternative notebook index directory"), - "", self.notebook_index_dir, - action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)) - - self.frame.show_all() + self.notebook_index_dir = self.notebook_xml.get_object("index_dir_entry") + self.notebook_xml.get_object("index_dir_browse").connect("clicked", + lambda w: on_browse(self.dialog, _("Choose alternative notebook index directory"), "", self.notebook_index_dir, action=Gtk.FileChooserAction.SELECT_FOLDER)) def load_options(self, app): - - if self.notebook is not None: - font = self.notebook.pref.get("default_font", - default=keepnote.gui.DEFAULT_FONT) + if self.notebook: + font = self.notebook.pref.get("default_font", default=keepnote.gui.DEFAULT_FONT) family, mods, size = keepnote.gui.richtext.parse_font(font) self.notebook_font_family.set_family(family) self.notebook_font_size.set_value(size) - - self.notebook_index_dir.set_text( - self.notebook.pref.get("index_dir", - default=u"", type=basestring)) + self.notebook_index_dir.set_text(self.notebook.pref.get("index_dir", default="", type=str)) def save_options(self, app): - if self.notebook is not None: + if self.notebook: pref = self.notebook.pref + pref.set("default_font", f"{self.notebook_font_family.get_family()} {int(self.notebook_font_size.get_value())}") + pref.set("index_dir", self.notebook_index_dir.get_text()) - # save notebook font - pref.set("default_font", "%s %d" % ( - self.notebook_font_family.get_family(), - self.notebook_font_size.get_value())) - - # alternative index directory - pref.set("index_dir", self.notebook_index_dir.get_text()) +class ExtensionsSection(Section): + def __init__(self, key, dialog, app, label="", icon=None): + super().__init__(key, dialog, app, label, icon) + self.app = app + self.entries = {} + self.frame = Gtk.Frame(label="Extensions") + self.frame.get_label_widget().set_use_markup(True) + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10) + box.set_margin_start(10) + box.set_margin_end(10) + box.set_margin_top(10) + self.frame.set_child(box) -class ExtensionsSection (Section): + self.sw = Gtk.ScrolledWindow() + self.sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + box.append(self.sw) - def __init__(self, key, dialog, app, label=u"", icon=None): - Section.__init__(self, key, dialog, app, label, icon) + self.extlist = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + self.sw.set_child(self.extlist) - self.app = app - self.entries = {} - self.frame = gtk.Frame("") - self.frame.get_label_widget().set_text("Extensions") - self.frame.get_label_widget().set_use_markup(True) - self.frame.set_property("shadow-type", gtk.SHADOW_NONE) - - align = gtk.Alignment() - align.set_padding(10, 0, 10, 0) - align.show() - self.frame.add(align) - - v = gtk.VBox(False, 0) - v.show() - align.add(v) - - # extension list scrollbar - self.sw = gtk.ScrolledWindow() - self.sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self.sw.set_shadow_type(gtk.SHADOW_IN) - self.sw.show() - v.pack_start(self.sw, True, True, 0) - - # extension list - self.extlist = gtk.VBox(False, 0) - self.extlist.show() - self.sw.add_with_viewport(self.extlist) - - # hbox - h = gtk.HBox(False, 0) - h.show() - v.pack_start(h, True, True, 0) - - # install button - self.install_button = gtk.Button("Install new extension") - self.install_button.set_relief(gtk.RELIEF_NONE) - self.install_button.modify_fg( - gtk.STATE_NORMAL, gtk.gdk.Color(0, 0, 65535)) + h = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0) + self.install_button = Gtk.Button(label="Install new extension") self.install_button.connect("clicked", self._on_install) - self.install_button.show() - h.pack_start(self.install_button, False, True, 0) + h.append(self.install_button) + box.append(h) - # set icon try: - self.icon = keepnote.gui.get_pixbuf( - get_icon_filename(gtk.STOCK_ADD), size=(15, 15)) + self.icon = keepnote.gui.get_pixbuf(get_icon_filename("list-add"), size=(15, 15)) except: pass def load_options(self, app): - - # clear extension list - self.extlist.foreach(self.extlist.remove) + for child in self.extlist.get_children(): + self.extlist.remove(child) def callback(ext): return lambda w: self._on_uninstall(ext.key) - # populate extension list exts = list(app.get_imported_extensions()) d = {"user": 0, "system": 1} exts.sort(key=lambda e: (d.get(e.type, 10), e.name)) @@ -669,24 +432,15 @@ def callback(ext): if ext.visible: p = ExtensionWidget(app, ext) p.uninstall_button.connect("clicked", callback(ext)) - p.show() - self.extlist.pack_start(p, True, True, 0) + self.extlist.append(p) - # setup scroll bar size - maxheight = 270 # TODO: make this more dynamic - w, h = self.extlist.size_request() - w2, h2 = self.sw.get_vscrollbar().size_request() - self.sw.set_size_request(400, min(maxheight, h+10)) + maxheight = 270 + w, h = self.extlist.get_preferred_size() + self.sw.set_size_request(400, min(maxheight, h.height + 10)) def save_options(self, app): - - app.pref.set( - "extension_info", "disabled", - [widget.ext.key for widget in self.extlist - if not widget.enabled]) - - # enable/disable extensions - for widget in self.extlist: + app.pref.set("extension_info", "disabled", [widget.ext.key for widget in self.extlist.get_children() if not widget.enabled]) + for widget in self.extlist.get_children(): if widget.enabled != widget.ext.is_enabled(): try: widget.ext.enable(widget.enabled) @@ -698,103 +452,69 @@ def _on_uninstall(self, ext): self.load_options(self.app) def _on_install(self, widget): - - # open file dialog - dialog = gtk.FileChooserDialog( - _("Install New Extension"), self.dialog, - action=gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("Open"), gtk.RESPONSE_OK)) + dialog = Gtk.FileChooserDialog( + title=_("Install New Extension"), + parent=self.dialog, + action=Gtk.FileChooserAction.OPEN, + ) + dialog.add_button(_("Cancel"), Gtk.ResponseType.CANCEL) + dialog.add_button(_("Open"), Gtk.ResponseType.OK) dialog.set_transient_for(self.dialog) dialog.set_modal(True) - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern("*.kne") file_filter.set_name(_("KeepNote Extension (*.kne)")) dialog.add_filter(file_filter) - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern("*") file_filter.set_name(_("All files (*.*)")) dialog.add_filter(file_filter) - response = dialog.run() - - if response == gtk.RESPONSE_OK and dialog.get_filename(): - # install extension + if dialog.run() == Gtk.ResponseType.OK and dialog.get_filename(): self.app.install_extension(dialog.get_filename()) self.load_options(self.app) dialog.destroy() - -class ExtensionWidget (gtk.EventBox): +class ExtensionWidget(Gtk.Box): def __init__(self, app, ext): - gtk.EventBox.__init__(self) - + super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=5) self.app = app self.enabled = ext.is_enabled() self.ext = ext - self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(65535, 65535, 65535)) - - frame = gtk.Frame(None) - frame.set_property("shadow-type", gtk.SHADOW_OUT) - frame.show() - self.add(frame) - - # name - frame2 = gtk.Frame("") - frame2.set_property("shadow-type", gtk.SHADOW_NONE) - frame2.get_label_widget().set_text("%s (%s/%s)" % - (ext.name, ext.type, - ext.key)) - frame2.get_label_widget().set_use_markup(True) - frame2.show() - frame.add(frame2) - - # margin - align = gtk.Alignment() - align.set_padding(10, 10, 10, 10) - align.show() - frame2.add(align) - - # vbox - v = gtk.VBox(False, 5) - v.show() - align.add(v) - - # description - l = gtk.Label(ext.description) - l.set_justify(gtk.JUSTIFY_LEFT) - l.set_alignment(0.0, 0.0) - l.show() - v.pack_start(l, True, True, 0) - - # hbox - h = gtk.HBox(False, 0) - h.show() - v.pack_start(h, True, True, 0) - - # enable button - self.enable_check = gtk.CheckButton(_("Enabled")) + frame = Gtk.Frame(label=f"{ext.name} ({ext.type}/{ext.key})") + frame.get_label_widget().set_use_markup(True) + self.append(frame) + + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) + box.set_margin_start(10) + box.set_margin_end(10) + box.set_margin_top(10) + box.set_margin_bottom(10) + frame.set_child(box) + + l = Gtk.Label(label=ext.description) + l.set_halign(Gtk.Align.START) + l.set_wrap(True) + box.append(l) + + h = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5) + self.enable_check = Gtk.CheckButton(label=_("Enabled")) self.enable_check.set_active(self.enabled) - self.enable_check.show() - self.enable_check.connect( - "toggled", lambda w: self._on_enabled(ext)) - h.pack_start(self.enable_check, False, True, 0) - - # divider - l = gtk.Label("|") - l.show() - h.pack_start(l, False, True, 0) - - # uninstall button - self.uninstall_button = gtk.Button(_("Uninstall")) - self.uninstall_button.set_relief(gtk.RELIEF_NONE) + self.enable_check.connect("toggled", lambda w: self._on_enabled(ext)) + h.append(self.enable_check) + + l = Gtk.Label(label="|") + h.append(l) + + self.uninstall_button = Gtk.Button(label=_("Uninstall")) self.uninstall_button.set_sensitive(app.can_uninstall(ext)) - self.uninstall_button.show() - h.pack_start(self.uninstall_button, False, True, 0) + h.append(self.uninstall_button) + + box.append(h) def update(self): self.enable_check.set_active(self.ext.is_enabled()) @@ -802,263 +522,177 @@ def update(self): def _on_enabled(self, ext): self.enabled = self.enable_check.get_active() - -#============================================================================= - -class ApplicationOptionsDialog (object): - """Application options""" - +class ApplicationOptionsDialog: def __init__(self, app): self.app = app self.parent = None - self._sections = [] - self.xml = gtk.glade.XML(get_resource("rc", "keepnote.glade"), - "app_options_dialog", keepnote.GETTEXT_DOMAIN) - self.dialog = self.xml.get_widget("app_options_dialog") - self.dialog.connect("delete-event", self._on_delete_event) - self.tabs = self.xml.get_widget("app_options_tabs") - self.xml.signal_autoconnect({ - "on_cancel_button_clicked": - lambda w: self.on_cancel_button_clicked(), - "on_ok_button_clicked": - lambda w: self.on_ok_button_clicked(), - "on_apply_button_clicked": - lambda w: self.on_apply_button_clicked()}) - - # setup treeview - self.overview = self.xml.get_widget("app_config_treeview") - self.overview_store = gtk.TreeStore(str, object, gdk.Pixbuf) + self.xml = Gtk.Builder() + glade_file = get_resource("rc", "keepnote.py.ui") + print(f"Loading GLADE file: {glade_file}") + try: + self.xml.add_from_file(glade_file) + except Exception as e: + raise Exception(f"Failed to load keepnote.py.ui: {str(e)}") + self.xml.set_translation_domain(keepnote.GETTEXT_DOMAIN) + + self.dialog = self.xml.get_object("app_options_dialog") + if self.dialog is None: + raise ValueError("Could not find 'app_options_dialog' in keepnote.py.ui") + self.dialog.connect("close-request", self._on_close_request) + + self.tabs = self.xml.get_object("app_options_tabs") + if self.tabs is None: + raise ValueError("Could not find 'app_options_tabs' in keepnote.py.ui") + + cancel_button = self.xml.get_object("cancel_button") + if cancel_button: + cancel_button.connect("clicked", self.on_cancel_button_clicked) + + ok_button = self.xml.get_object("ok_button") + if ok_button: + ok_button.connect("clicked", self.on_ok_button_clicked) + + apply_button = self.xml.get_object("apply_button") + if apply_button: + apply_button.connect("clicked", self.on_apply_button_clicked) + + self.overview = self.xml.get_object("app_config_treeview") + if self.overview is None: + raise ValueError("Could not find 'app_config_treeview' in keepnote.py.ui") + self.overview_store = Gtk.TreeStore(str, object, GdkPixbuf.Pixbuf) self.overview.set_model(self.overview_store) - self.overview.connect("cursor-changed", self.on_overview_select) + self.overview.connect("row-activated", self.on_overview_select) - # create the treeview column - column = gtk.TreeViewColumn() + column = Gtk.TreeViewColumn() self.overview.append_column(column) - cell_text = gtk.CellRendererText() - cell_icon = gtk.CellRendererPixbuf() + cell_icon = Gtk.CellRendererPixbuf() + cell_text = Gtk.CellRendererText() column.pack_start(cell_icon, True) - column.add_attribute(cell_icon, 'pixbuf', 2) + column.add_attribute(cell_icon, "pixbuf", 2) column.pack_start(cell_text, True) - column.add_attribute(cell_text, 'text', 0) + column.add_attribute(cell_text, "text", 0) - # add tabs self.add_default_sections() - def show(self, parent, section=None): - """Display application options""" - - self.parent = parent - self.dialog.set_transient_for(parent) - - # add notebook options - self.notebook_sections = [ - self.add_section(NoteBookSection("notebook_%d" % i, - self.dialog, self.app, - notebook, - notebook.get_title()), - "notebooks") - for i, notebook in enumerate(self.app.iter_notebooks())] - - # add extension options - self.extensions_ui = [] - for ext in self.app.get_enabled_extensions(): - if isinstance(ext, keepnote.gui.extension.Extension): - ext.on_add_options_ui(self) - self.extensions_ui.append(ext) - - # populate options ui - self.load_options(self.app) - - self.dialog.show() - - if section: - try: - self.overview.set_cursor(self.get_section_path(section)) - except: - pass - - def finish(self): - # remove extension options - for ext in self.extensions_ui: - if isinstance(ext, keepnote.gui.extension.Extension): - ext.on_remove_options_ui(self) - self.extensions_ui = [] - - # remove notebook options - for section in self.notebook_sections: - self.remove_section(section.key) - - def add_default_sections(self): - - self.add_section( - GeneralSection("general", self.dialog, self.app, - keepnote.PROGRAM_NAME)) - self.add_section( - LookAndFeelSection("look_and_feel", self.dialog, - self.app, _("Look and Feel")), - "general") - self.add_section( - LanguageSection("language", self.dialog, self.app, - _("Language")), - "general") - self.add_section( - DatesSection("date_and_time", self.dialog, self.app, - _("Date and Time")), - "general") - self.add_section( - EditorSection("ediotr", self.dialog, self.app, _("Editor")), - "general") - self.add_section( - HelperAppsSection("helper_apps", self.dialog, - self.app, _("Helper Applications")), - "general") - self.add_section( - AllNoteBooksSection("notebooks", self.dialog, self.app, - _("Notebook Options"), "folder.png")) - self.add_section( - ExtensionsSection("extensions", self.dialog, - self.app, _("Extensions"))) - - #===================================== - # options - - def load_options(self, app): - """Load options into sections""" - for section in self._sections: - section.load_options(self.app) - - def save_options(self, app): - """Save the options from each section""" - - # let app record its preferences first - app.save_preferences() - - # let sections record their preferences - for section in self._sections: - section.save_options(self.app) - - # notify changes - # app and notebook will load prefs from plist - self.app.pref.changed.notify() - for notebook in self.app.iter_notebooks(): - notebook.notify_change(False) - - # force a app and notebook preference save - # save prefs to plist and to disk - app.save() - - #===================================== - # section handling - def add_section(self, section, parent=None): - """Add a section to the Options Dialog""" + if section.frame is None: + print(f"Warning: Section '{section.key}' has no frame; skipping") + return None - # icon size size = (15, 15) - - # determine parent section - if parent is not None: + if parent: path = self.get_section_path(parent) it = self.overview_store.get_iter(path) else: it = None self._sections.append(section) - self.tabs.insert_page(section.frame, tab_label=None) + self.tabs.append_page(section.frame) section.frame.show() - section.frame.queue_resize() icon = section.icon if icon is None: icon = "note.png" + pixbuf = keepnote.gui.get_resource_pixbuf(icon, size=size) if isinstance(icon, str) else icon - if isinstance(icon, basestring): - pixbuf = keepnote.gui.get_resource_pixbuf(icon, size=size) - else: - pixbuf = icon - - # add to overview it = self.overview_store.append(it, [section.label, section, pixbuf]) path = self.overview_store.get_path(it) self.overview.expand_to_path(path) return section + def add_default_sections(self): + self.add_section(GeneralSection("general", self.dialog, self.app, keepnote.PROGRAM_NAME)) + self.add_section(LookAndFeelSection("look_and_feel", self.dialog, self.app, _("Look and Feel")), "general") + self.add_section(LanguageSection("language", self.dialog, self.app, _("Language")), "general") + self.add_section(DatesSection("date_and_time", self.dialog, self.app, _("Date and Time")), "general") + self.add_section(EditorSection("editor", self.dialog, self.app, _("Editor")), "general") + self.add_section(HelperAppsSection("helper_apps", self.dialog, self.app, _("Helper Applications")), "general") + self.add_section(AllNoteBooksSection("notebooks", self.dialog, self.app, _("Notebook Options"), "folder.png")) + self.add_section(ExtensionsSection("extensions", self.dialog, self.app, _("Extensions"))) + + def load_options(self, app): + for section in self._sections: + section.load_options(app) + + def save_options(self, app): + app.save_preferences() + for section in self._sections: + section.save_options(app) + self.app.pref.changed.notify() + for notebook in self.app.iter_notebooks(): + notebook.notify_change(False) + app.save() + def remove_section(self, key): - # remove from tabs section = self.get_section(key) if section: self.tabs.remove_page(self._sections.index(section)) self._sections.remove(section) - - # remove from tree path = self.get_section_path(key) - if path is not None: + if path: self.overview_store.remove(self.overview_store.get_iter(path)) def get_section(self, key): - """Returns the section for a key""" - for section in self._sections: if section.key == key: return section return None def get_section_path(self, key): - """Returns the TreeModel path for a section""" - def walk(node): - child = self.overview_store.iter_children(node) while child: row = self.overview_store[child] if row[1].key == key: return row.path - - # recurse ret = walk(child) if ret: return ret - child = self.overview_store.iter_next(child) - return None return walk(None) - #========================================================== - # callbacks - - def on_overview_select(self, overview): - """Callback for changing topic in overview""" - row, col = overview.get_cursor() - if row is not None: - section = self.overview_store[row][1] + def on_overview_select(self, overview, path, column): + if path: + section = self.overview_store[path][1] self.tabs.set_current_page(self._sections.index(section)) - def on_cancel_button_clicked(self): - """Callback for cancel button""" + def on_cancel_button_clicked(self, widget): self.dialog.hide() - self.finish() - def on_ok_button_clicked(self): - """Callback for ok button""" + def on_ok_button_clicked(self, widget): self.save_options(self.app) self.dialog.hide() - self.finish() - def on_apply_button_clicked(self): - """Callback for apply button""" + def on_apply_button_clicked(self, widget): self.save_options(self.app) - # clean up and reshow dialog - self.finish() - self.show(self.parent) - - def _on_delete_event(self, widget, event): - """Callback for window close""" + def _on_close_request(self, widget): self.dialog.hide() - self.finish() - self.dialog.stop_emission("delete-event") return True + + def show(self, parent): + self.parent = parent + self.dialog.set_transient_for(parent) + self.load_options(self.app) + self.dialog.show() + +if __name__ == "__main__": + class MockApp: + def __init__(self): + self.pref = keepnote.pref.AppPreferences() + def get_current_window(self): return None + def iter_notebooks(self): return [] + def save_preferences(self): pass + def save(self): pass + def iter_external_apps(self): return [] + def get_imported_extensions(self): return [] + def get_enabled_extensions(self): return [] + + app = MockApp() + dialog = ApplicationOptionsDialog(app) + dialog.show(None) + Gtk.main() \ No newline at end of file diff --git a/keepnote/gui/dialog_drag_drop_test.py b/keepnote/gui/dialog_drag_drop_test.py index 480bfded9..44c0e1008 100644 --- a/keepnote/gui/dialog_drag_drop_test.py +++ b/keepnote/gui/dialog_drag_drop_test.py @@ -1,120 +1,122 @@ -""" - - KeepNote - Drag Drop Testing Dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, Gdk -def parse_utf(text): - # TODO: lookup the standard way to do this - - if (text[:2] in ('\xff\xfe', '\xfe\xff') or - (len(text) > 1 and text[1] == '\x00') or - (len(text) > 3 and text[3] == '\x00')): - return text.decode("utf16") - else: - return unicode(text, "utf8") +# KeepNote imports (assuming the keepnote.py module is available) +import keepnote -class DragDropTestDialog (object): +def parse_utf(text): + """Parse UTF-encoded text (UTF-8 or UTF-16).""" + if isinstance(text, bytes): + if (text[:2] in (b'\xff\xfe', b'\xfe\xff') or + (len(text) > 1 and text[1] == 0) or + (len(text) > 3 and text[3] == 0)): + return text.decode("utf-16") + else: + return text.decode("utf-8") + return text + + +class DragDropTestDialog: """Drag and drop testing dialog""" def __init__(self, main_window): self.main_window = main_window def on_drag_and_drop_test(self): - self.drag_win = gtk.Window(gtk.WINDOW_TOPLEVEL) - self.drag_win.connect( - "delete-event", lambda d, r: self.drag_win.destroy()) - self.drag_win.drag_dest_set(0, [], gtk.gdk.ACTION_DEFAULT) - + self.drag_win = Gtk.Window() + self.drag_win.connect("close-request", lambda w: self.drag_win.destroy()) self.drag_win.set_default_size(400, 400) - vbox = gtk.VBox(False, 0) - self.drag_win.add(vbox) - - self.drag_win.mime = gtk.TextView() - vbox.pack_start(self.drag_win.mime, False, True, 0) - - self.drag_win.editor = gtk.TextView() - self.drag_win.editor.connect( - "drag-motion", self.on_drag_and_drop_test_motion) - self.drag_win.editor.connect( - "drag-data-received", self.on_drag_and_drop_test_data) - self.drag_win.editor.connect( - "paste-clipboard", self.on_drag_and_drop_test_paste) - self.drag_win.editor.set_wrap_mode(gtk.WRAP_WORD) - - sw = gtk.ScrolledWindow() - sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - sw.set_shadow_type(gtk.SHADOW_IN) - sw.add(self.drag_win.editor) - vbox.pack_start(sw) - - self.drag_win.show_all() - - def on_drag_and_drop_test_motion(self, textview, drag_context, - x, y, timestamp): + + vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + self.drag_win.set_child(vbox) + + self.drag_win.mime = Gtk.TextView() + vbox.append(self.drag_win.mime) + + self.drag_win.editor = Gtk.TextView() + self.drag_win.editor.set_wrap_mode(Gtk.WrapMode.WORD) + + # Set up drag and drop with Gtk.DropTarget + drop_target = Gtk.DropTarget.new(str, Gdk.DragAction.COPY | Gdk.DragAction.MOVE) + drop_target.connect("motion", self.on_drag_and_drop_test_motion) + drop_target.connect("drop", self.on_drag_and_drop_test_drop) + self.drag_win.editor.add_controller(drop_target) + + # Connect paste clipboard signal + self.drag_win.editor.connect("paste-clipboard", self.on_drag_and_drop_test_paste) + + sw = Gtk.ScrolledWindow() + sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + sw.set_child(self.drag_win.editor) + vbox.append(sw) + + self.drag_win.show() + + def on_drag_and_drop_test_motion(self, drop_target, x, y): buf = self.drag_win.mime.get_buffer() - target = buf.get_text(buf.get_start_iter(), buf.get_end_iter()) + target = buf.get_text(buf.get_start_iter(), buf.get_end_iter(), False) if target != "": - textview.drag_dest_set_target_list([(target, 0, 0)]) - - def on_drag_and_drop_test_data(self, textview, drag_context, x, y, - selection_data, info, eventtime): - textview.get_buffer().insert_at_cursor( - "drag_context = " + str(drag_context.targets) + "\n") - textview.stop_emission("drag-data-received") + # In GTK 4, DropTarget accepts a single type or None; adjust dynamically if needed + drop_target.set_gtypes([str]) # We expect string data + return Gdk.DragAction.COPY # Indicate we can accept the drop + def on_drag_and_drop_test_drop(self, drop_target, value, x, y): + # In GTK 4, drop data is passed directly as a value + textview = self.drag_win.editor buf = textview.get_buffer() - buf.insert_at_cursor("type(sel.data) = " + - str(type(selection_data.data)) + "\n") - buf.insert_at_cursor("sel.data = " + - repr(selection_data.data)[:1000] + "\n") - drag_context.finish(False, False, eventtime) + + # Get formats from the drop target + formats = drop_target.get_formats() + targets = [fmt for fmt in formats.get_content_types()] # Get list of mime types + buf.insert_at_cursor(f"drop formats = {targets}\n") + + # Handle the dropped data + data = value if isinstance(value, str) else str(value) # Ensure string data + buf.insert_at_cursor(f"type(value) = {type(value)}\n") + buf.insert_at_cursor(f"value = {repr(data)[:1000]}\n") + + # No need for drag_context.finish in GTK 4; DropTarget handles it + return True # Indicate drop was successful def on_drag_and_drop_test_paste(self, textview): - clipboard = self.main_window.get_clipboard(selection="CLIPBOARD") - targets = clipboard.wait_for_targets() - textview.get_buffer().insert_at_cursor( - "clipboard.targets = " + str(targets) + "\n") - textview.stop_emission('paste-clipboard') + clipboard = Gtk.Clipboard.get_default(self.main_window.get_display()) + + # In GTK 4, clipboard handling is async; use read_text_async + def on_clipboard_text(clipboard, result): + text = clipboard.read_text_finish(result) + buf = self.drag_win.editor.get_buffer() + buf.insert_at_cursor(f"clipboard.text = {repr(text)[:1000]}\n") + buf.insert_at_cursor(f"type(text) = {type(text)}\n") buf = self.drag_win.mime.get_buffer() - target = buf.get_text(buf.get_start_iter(), buf.get_end_iter()) + target = buf.get_text(buf.get_start_iter(), buf.get_end_iter(), False) if target != "": - clipboard.request_contents( - target, self.on_drag_and_drop_test_contents) - - def on_drag_and_drop_test_contents(self, clipboard, selection_data, data): - buf = self.drag_win.editor.get_buffer() - data = selection_data.data - buf.insert_at_cursor("sel.targets = " + - repr(selection_data.get_targets()) + "\n") - buf.insert_at_cursor("type(sel.data) = " + str(type(data))+"\n") - print "sel.data = " + repr(data)[:1000]+"\n" - buf.insert_at_cursor("sel.data = " + repr(data)[:5000] + "\n") + clipboard.read_text_async(None, on_clipboard_text) + + # Stop emission not needed in GTK 4 for this case, but we can prevent default paste + return True + + def on_drag_and_drop_test_contents(self, clipboard, result, data): + # This method is no longer directly used due to async clipboard in GTK 4 + # Handled in on_clipboard_text callback above + pass + + +if __name__ == "__main__": + # Minimal test setup (requires a mock main_window) + class MockWindow: + def get_display(self): + return Gdk.Display.get_default() + + def get_clipboard(self, selection=None): + return Gtk.Clipboard.get_default(Gdk.Display.get_default()) + + + win = MockWindow() + dialog = DragDropTestDialog(win) + dialog.on_drag_and_drop_test() + Gtk.main() \ No newline at end of file diff --git a/keepnote/gui/dialog_find.py b/keepnote/gui/dialog_find.py index a32ccb4db..dd6fdfad9 100644 --- a/keepnote/gui/dialog_find.py +++ b/keepnote/gui/dialog_find.py @@ -1,58 +1,32 @@ -""" - - KeepNote - Find Dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade - -# keepnote imports -import keepnote -from keepnote import get_resource, unicode_gtk - +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, Gdk -class KeepNoteFindDialog (object): - """ Find dialog """ +# KeepNote imports +import keepnote +from keepnote import get_resource +from keepnote.util.platform import unicode_gtk +class KeepNoteFindDialog: + """Find dialog for KeepNote editor""" def __init__(self, editor): self.editor = editor self.find_dialog = None self.find_text = None self.replace_text = None + self.find_builder = None + self.find_last_pos = -1 def on_find(self, replace=False, forward=None): if self.find_dialog is not None: self.find_dialog.present() - # could add find again behavior here - self.find_xml.get_widget("replace_checkbutton").set_active(replace) - self.find_xml.get_widget("replace_entry").set_sensitive(replace) - self.find_xml.get_widget("replace_button").set_sensitive(replace) - self.find_xml.get_widget( - "replace_all_button").set_sensitive(replace) + # Update UI for replace mode + self.find_builder.get_object("replace_checkbutton").set_active(replace) + self.find_builder.get_object("replace_entry").set_sensitive(replace) + self.find_builder.get_object("replace_button").set_sensitive(replace) + self.find_builder.get_object("replace_all_button").set_sensitive(replace) if not replace: if forward is None: @@ -66,107 +40,97 @@ def on_find(self, replace=False, forward=None): return - self.find_xml = gtk.glade.XML(get_resource("rc", "keepnote.glade"), - domain=keepnote.GETTEXT_DOMAIN) - self.find_dialog = self.find_xml.get_widget("find_dialog") - self.find_dialog.connect( - "delete-event", lambda w, e: self.on_find_response("close")) - self.find_last_pos = -1 - - self.find_xml.signal_autoconnect({ - "on_find_dialog_key_release_event": - self.on_find_key_released, - "on_close_button_clicked": - lambda w: self.on_find_response("close"), - "on_find_button_clicked": - lambda w: self.on_find_response("find"), - "on_replace_button_clicked": - lambda w: self.on_find_response("replace"), - "on_replace_all_button_clicked": - lambda w: self.on_find_response("replace_all"), - "on_replace_checkbutton_toggled": - lambda w: self.on_find_replace_toggled() - }) - + # Load the UI file (replacing Glade with a GTK 4 UI file) + self.find_builder = Gtk.Builder() + self.find_builder.add_from_file(get_resource("rc", "keepnote.py.ui")) # Update to .ui file + self.find_builder.set_translation_domain(keepnote.GETTEXT_DOMAIN) + self.find_dialog = self.find_builder.get_object("find_dialog") + self.find_dialog.connect("close-request", lambda w: self.on_find_response("close")) + + # Connect signals + self.find_builder.get_object("close_button").connect("clicked", lambda w: self.on_find_response("close")) + self.find_builder.get_object("find_button").connect("clicked", lambda w: self.on_find_response("find")) + self.find_builder.get_object("replace_button").connect("clicked", lambda w: self.on_find_response("replace")) + self.find_builder.get_object("replace_all_button").connect("clicked", lambda w: self.on_find_response("replace_all")) + self.find_builder.get_object("replace_checkbutton").connect("toggled", lambda w: self.on_find_replace_toggled()) + + # Add key controller for Ctrl+G and Ctrl+Shift+G + key_controller = Gtk.EventControllerKey.new() + key_controller.connect("key-released", self.on_find_key_released) + self.find_dialog.add_controller(key_controller) + + # Set initial values if self.find_text is not None: - self.find_xml.get_widget("text_entry").set_text(self.find_text) + self.find_builder.get_object("text_entry").set_text(self.find_text) if self.replace_text is not None: - self.find_xml.get_widget("replace_entry").set_text( - self.replace_text) - - self.find_xml.get_widget("replace_checkbutton").set_active(replace) - self.find_xml.get_widget("replace_entry").set_sensitive(replace) - self.find_xml.get_widget("replace_button").set_sensitive(replace) - self.find_xml.get_widget("replace_all_button").set_sensitive(replace) - - self.find_dialog.show() - self.find_dialog.move(*self.editor.get_toplevel().get_position()) - - def on_find_key_released(self, widget, event): - - if (event.keyval == gtk.keysyms.G and - event.state & gtk.gdk.SHIFT_MASK and - event.state & gtk.gdk.CONTROL_MASK): + self.find_builder.get_object("replace_entry").set_text(self.replace_text) + + self.find_builder.get_object("replace_checkbutton").set_active(replace) + self.find_builder.get_object("replace_entry").set_sensitive(replace) + self.find_builder.get_object("replace_button").set_sensitive(replace) + self.find_builder.get_object("replace_all_button").set_sensitive(replace) + + self.find_dialog.present() + # Position the dialog relative to the editor's top-level window + parent_pos = self.editor.get_toplevel().get_position() + self.find_dialog.set_position(parent_pos[0], parent_pos[1]) + + def on_find_key_released(self, controller, keyval, keycode, state): + # Check for Ctrl+G (find next) or Ctrl+Shift+G (find previous) + if (keyval == Gdk.KEY_G and + (state & Gdk.ModifierType.SHIFT_MASK) and + (state & Gdk.ModifierType.CONTROL_MASK)): self.on_find_response("find_prev") - widget.stop_emission("key-release-event") + return True - elif (event.keyval == gtk.keysyms.g and - event.state & gtk.gdk.CONTROL_MASK): + elif (keyval == Gdk.KEY_g and + (state & Gdk.ModifierType.CONTROL_MASK)): self.on_find_response("find_next") - widget.stop_emission("key-release-event") + return True - def on_find_response(self, response): + return False - # get find options - find_text = unicode_gtk( - self.find_xml.get_widget("text_entry").get_text()) - replace_text = unicode_gtk( - self.find_xml.get_widget("replace_entry").get_text()) - case_sensitive = self.find_xml.get_widget( - "case_sensitive_button").get_active() - search_forward = self.find_xml.get_widget( - "forward_button").get_active() + def on_find_response(self, response): + # Get find options + find_text = unicode_gtk(self.find_builder.get_object("text_entry").get_text()) + replace_text = unicode_gtk(self.find_builder.get_object("replace_entry").get_text()) + case_sensitive = self.find_builder.get_object("case_sensitive_button").get_active() + search_forward = self.find_builder.get_object("forward_button").get_active() self.find_text = find_text self.replace_text = replace_text - next = (self.find_last_pos != -1) + next_search = (self.find_last_pos != -1) if response == "close": self.find_dialog.destroy() self.find_dialog = None + self.find_builder = None elif response == "find": self.find_last_pos = self.editor.get_textview().find( - find_text, case_sensitive, search_forward, next) + find_text, case_sensitive, search_forward, next_search) elif response == "find_next": - self.find_xml.get_widget("forward_button").set_active(True) + self.find_builder.get_object("forward_button").set_active(True) self.find_last_pos = self.editor.get_textview().find( find_text, case_sensitive, True) elif response == "find_prev": - self.find_xml.get_widget("backward_button").set_active(True) + self.find_builder.get_object("backward_button").set_active(True) self.find_last_pos = self.editor.get_textview().find( find_text, case_sensitive, False) elif response == "replace": self.find_last_pos = self.editor.get_textview().replace( - find_text, replace_text, - case_sensitive, search_forward) + find_text, replace_text, case_sensitive, search_forward) elif response == "replace_all": self.editor.get_textview().replace_all( - find_text, replace_text, - case_sensitive, search_forward) + find_text, replace_text, case_sensitive, search_forward) def on_find_replace_toggled(self): - - if self.find_xml.get_widget("replace_checkbutton").get_active(): - self.find_xml.get_widget("replace_entry").set_sensitive(True) - self.find_xml.get_widget("replace_button").set_sensitive(True) - self.find_xml.get_widget("replace_all_button").set_sensitive(True) - else: - self.find_xml.get_widget("replace_entry").set_sensitive(False) - self.find_xml.get_widget("replace_button").set_sensitive(False) - self.find_xml.get_widget("replace_all_button").set_sensitive(False) + replace_active = self.find_builder.get_object("replace_checkbutton").get_active() + self.find_builder.get_object("replace_entry").set_sensitive(replace_active) + self.find_builder.get_object("replace_button").set_sensitive(replace_active) + self.find_builder.get_object("replace_all_button").set_sensitive(replace_active) \ No newline at end of file diff --git a/keepnote/gui/dialog_image_new.py b/keepnote/gui/dialog_image_new.py index 015507f66..2d78731de 100644 --- a/keepnote/gui/dialog_image_new.py +++ b/keepnote/gui/dialog_image_new.py @@ -1,90 +1,72 @@ -""" - - KeepNote - Image Resize Dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade - -# keepnote imports +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk + +# KeepNote imports import keepnote _ = keepnote.translate - -class NewImageDialog (object): - """New Image dialog""" +class NewImageDialog: + """New Image dialog for KeepNote""" def __init__(self, main_window, app): self.main_window = main_window self.app = app + self.width_entry = None + self.height_entry = None + self.format_entry = None def show(self): - - dialog = gtk.Dialog(_("New Image"), - self.main_window, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, - gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)) - - table = gtk.Table(3, 2) - dialog.vbox.pack_start(table, False, True, 0) - - label = gtk.Label(_("format:")) - table.attach(label, 0, 1, 0, 1, - xoptions=0, yoptions=0, - xpadding=2, ypadding=2) - - # make this a drop down - self.width = gtk.Entry() - table.attach(self.width, 1, 2, 0, 1, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) - - label = gtk.Label(_("width:")) - table.attach(label, 0, 1, 0, 1, - xoptions=0, yoptions=0, - xpadding=2, ypadding=2) - - self.width = gtk.Entry() - table.attach(self.width, 1, 2, 0, 1, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) - - label = gtk.Label(_("height:")) - table.attach(label, 0, 1, 0, 1, - xoptions=0, yoptions=0, - xpadding=2, ypadding=2) - - self.width = gtk.Entry() - table.attach(self.width, 1, 2, 0, 1, - xoptions=gtk.FILL, yoptions=0, - xpadding=2, ypadding=2) - - table.show_all() - dialog.run() + dialog = Gtk.Dialog( + title=_("New Image"), + transient_for=self.main_window, + modal=True + ) + + # Add buttons using the new GTK 4 API + dialog.add_button(_("_Cancel"), Gtk.ResponseType.CANCEL) + dialog.add_button(_("_OK"), Gtk.ResponseType.OK) + + # Create a grid + grid = Gtk.Grid() + grid.set_row_spacing(6) + grid.set_column_spacing(6) + dialog.get_content_area().append(grid) + + # Format label and entry + label = Gtk.Label(label=_("format:")) + grid.attach(label, 0, 0, 1, 1) + + self.format_entry = Gtk.Entry() + grid.attach(self.format_entry, 1, 0, 1, 1) + + # Width label and entry + label = Gtk.Label(label=_("width:")) + grid.attach(label, 0, 1, 1, 1) + + self.width_entry = Gtk.Entry() + grid.attach(self.width_entry, 1, 1, 1, 1) + + # Height label and entry + label = Gtk.Label(label=_("height:")) + grid.attach(label, 0, 2, 1, 1) + + self.height_entry = Gtk.Entry() + grid.attach(self.height_entry, 1, 2, 1, 1) + + # Run the dialog and get the response + dialog.present() + response = dialog.run() + + # Retrieve the values if needed + if response == Gtk.ResponseType.OK: + format_value = self.format_entry.get_text() + width_value = self.width_entry.get_text() + height_value = self.height_entry.get_text() + # Do something with the values if needed + print(f"Format: {format_value}, Width: {width_value}, Height: {height_value}") dialog.destroy() + return response \ No newline at end of file diff --git a/keepnote/gui/dialog_image_resize.py b/keepnote/gui/dialog_image_resize.py index 4c745e1e8..bdf5c11e9 100644 --- a/keepnote/gui/dialog_image_resize.py +++ b/keepnote/gui/dialog_image_resize.py @@ -1,234 +1,83 @@ -""" - - KeepNote - Image Resize Dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade - -# keepnote imports -import keepnote -from keepnote import get_resource +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk -# TODO: separate out error callback +# KeepNote imports +import keepnote +_ = keepnote.translate -class ImageResizeDialog (object): - """Image Resize dialog """ +class NewImageDialog: + """New Image dialog for KeepNote""" - def __init__(self, main_window, app_pref): + def __init__(self, main_window, app): self.main_window = main_window - self.app_pref = app_pref - self.dialog = None - self.image = None - self.aspect = True - self.owidth, self.oheight = None, None - self.init_width, self.init_height = None, None - self.ignore_width_changed = 0 - self.ignore_height_changed = 0 - self.snap_size = self.app_pref.get( - "editors", "general", "image_size_snap_amount", default=50) - self.snap_enabled = self.app_pref.get( - "editors", "general", "image_size_snap", default=True) - - # widgets - self.size_width_scale = None - self.size_height_scale = None + self.app = app self.width_entry = None self.height_entry = None - self.aspect_check = None - self.snap_check = None - self.snap_entry = None - - def on_resize(self, image): - """Launch resize dialog""" - if not image.is_valid(): - self.main_window.error( - "Cannot resize image that is not properly loaded") - return - - self.xml = gtk.glade.XML(get_resource("rc", "keepnote.glade"), - domain=keepnote.GETTEXT_DOMAIN) - self.dialog = self.xml.get_widget("image_resize_dialog") - self.dialog.set_transient_for(self.main_window) - self.dialog.connect("response", lambda d, r: self.on_response(r)) - - # TODO: convert to run - self.dialog.show() - - self.image = image - self.aspect = True - width, height = image.get_size(True) - self.init_width, self.init_height = width, height - self.owidth, self.oheight = image.get_original_size() - - # get widgets - self.width_entry = self.xml.get_widget("width_entry") - self.height_entry = self.xml.get_widget("height_entry") - self.size_width_scale = self.xml.get_widget("size_width_scale") - self.size_height_scale = self.xml.get_widget("size_height_scale") - self.aspect_check = self.xml.get_widget("aspect_check") - self.snap_check = self.xml.get_widget("img_snap_check") - self.snap_entry = self.xml.get_widget("img_snap_amount_entry") - - # populate info - self.width_entry.set_text(str(width)) - self.height_entry.set_text(str(height)) - self.size_width_scale.set_value(width) - self.size_height_scale.set_value(height) - self.snap_check.set_active(self.snap_enabled) - self.snap_entry.set_text(str(self.snap_size)) - - # callback - self.xml.signal_autoconnect({ - "on_width_entry_changed": - lambda w: self.on_size_changed("width"), - "on_height_entry_changed": - lambda w: self.on_size_changed("height")}) - - self.xml.signal_autoconnect(self) - - def get_size(self): - """Returns the current size setting of the dialog""" - wstr = self.width_entry.get_text() - hstr = self.height_entry.get_text() - - try: - width, height = int(wstr), int(hstr) - - if width <= 0: - width = None - if height <= 0: - height = None - - except ValueError: - width, height = None, None - return width, height - - def on_response(self, response): - """Callback for a response button in dialog""" - if response == gtk.RESPONSE_OK: - width, height = self.get_size() - - p = self.app_pref.get("editors", "general") - p["image_size_snap"] = self.snap_enabled - p["image_size_snap_amount"] = self.snap_size - - if width is not None: - self.image.scale(width, height) - self.dialog.destroy() - else: - self.main_window.error( - "Must specify positive integers for image size") - - elif response == gtk.RESPONSE_CANCEL: - self.dialog.destroy() - - elif response == gtk.RESPONSE_APPLY: - width, height = self.get_size() - - if width is not None: - self.image.scale(width, height) - - elif response == gtk.RESPONSE_REJECT: - # restore default image size - width, height = self.image.get_original_size() - self.width_entry.set_text(str(width)) - self.height_entry.set_text(str(height)) - - def set_size(self, dim, value): - if dim == "width": - if self.ignore_width_changed == 0: - self.ignore_width_changed += 1 - self.width_entry.set_text(value) - self.ignore_width_changed -= 1 + self.format_entry = None + self._response_handler = None + + def show(self, callback=None): + """Show the dialog and call the callback with (response, format, width, height)""" + self._response_handler = callback + + dialog = Gtk.Dialog( + title=_("New Image"), + transient_for=self.main_window, + modal=True + ) + + # Add buttons using the GTK 4 API + dialog.add_button(_("_Cancel"), Gtk.ResponseType.CANCEL) + dialog.add_button(_("_OK"), Gtk.ResponseType.OK) + + # Create a grid + grid = Gtk.Grid() + grid.set_row_spacing(6) + grid.set_column_spacing(6) + dialog.get_content_area().append(grid) + + # Format label and entry + label = Gtk.Label(label=_("format:")) + grid.attach(label, 0, 0, 1, 1) + + self.format_entry = Gtk.Entry() + grid.attach(self.format_entry, 1, 0, 1, 1) + + # Width label and entry + label = Gtk.Label(label=_("width:")) + grid.attach(label, 0, 1, 1, 1) + + self.width_entry = Gtk.Entry() + grid.attach(self.width_entry, 1, 1, 1, 1) + + # Height label and entry + label = Gtk.Label(label=_("height:")) + grid.attach(label, 0, 2, 1, 1) + + self.height_entry = Gtk.Entry() + grid.attach(self.height_entry, 1, 2, 1, 1) + + # Connect the response signal instead of using dialog.run() + dialog.connect("response", self._on_dialog_response) + dialog.present() + + def _on_dialog_response(self, dialog, response): + # Retrieve the values if needed + if response == Gtk.ResponseType.OK: + format_value = self.format_entry.get_text() + width_value = self.width_entry.get_text() + height_value = self.height_entry.get_text() + # Call the callback with the response and values + if self._response_handler: + self._response_handler(response, format_value, width_value, height_value) + # For debugging or logging + print(f"Format: {format_value}, Width: {width_value}, Height: {height_value}") else: - if self.ignore_height_changed == 0: - self.ignore_height_changed += 1 - self.height_entry.set_text(value) - self.ignore_height_changed -= 1 - - def on_size_changed(self, dim): - """Callback when a size changes""" - if dim == "width": - self.ignore_width_changed += 1 - else: - self.ignore_height_changed += 1 - - width, height = self.get_size() + # Call the callback with the response and None values for cancel + if self._response_handler: + self._response_handler(response, None, None, None) - if self.aspect: - if dim == "width" and width is not None: - height = int(width / float(self.owidth) * self.oheight) - self.size_width_scale.set_value(width) - self.set_size("height", str(height)) - - elif dim == "height" and height is not None: - width = int(height / float(self.oheight) * self.owidth) - self.size_height_scale.set_value(height) - self.set_size("width", str(width)) - - if width is not None and height is not None: - self.init_width, self.init_height = width, height - - if dim == "width": - self.ignore_width_changed -= 1 - else: - self.ignore_height_changed -= 1 - - def on_aspect_check_toggled(self, widget): - """Callback when aspect checkbox is toggled""" - self.aspect = self.aspect_check.get_active() - - def on_size_width_scale_value_changed(self, scale): - """Callback for when scale value changes""" - width = int(scale.get_value()) - - if self.snap_enabled: - snap = self.snap_size - width = int((width + snap/2.0) // snap * snap) - self.set_size("width", str(width)) - - def on_size_height_scale_value_changed(self, scale): - """Callback for when scale value changes""" - height = int(scale.get_value()) - - if self.snap_enabled: - snap = self.snap_size - height = int((height + snap/2.0) // snap * snap) - self.set_size("height", str(height)) - - def on_img_snap_check_toggled(self, check): - """Callback when snap checkbox is toggled""" - self.snap_enabled = self.snap_check.get_active() - self.snap_entry.set_sensitive(self.snap_enabled) - - def on_img_snap_entry_changed(self, entry): - """Callback when snap text entry changes""" - try: - self.snap_size = int(self.snap_entry.get_text()) - except ValueError: - pass + dialog.destroy() \ No newline at end of file diff --git a/keepnote/gui/dialog_node_icon.py b/keepnote/gui/dialog_node_icon.py index 75556b37e..33de0cc01 100644 --- a/keepnote/gui/dialog_node_icon.py +++ b/keepnote/gui/dialog_node_icon.py @@ -1,159 +1,150 @@ -""" - - KeepNote - Update notebook dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python 3 and PyGObject imports import os +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, GdkPixbuf -# pygtk imports -import pygtk -pygtk.require('2.0') -import gobject -import gtk -import gtk.glade - -# keepnote imports +# KeepNote imports import keepnote -from keepnote import unicode_gtk +from keepnote.util.platform import unicode_gtk import keepnote.gui -from keepnote.gui.icons import \ - guess_open_icon_filename, \ - lookup_icon_filename, \ - builtin_icons, \ +from keepnote.gui.icons import ( + guess_open_icon_filename, + lookup_icon_filename, + builtin_icons, get_node_icon_filenames - -_ = keepnote.translate - +) +# 修改为从 util.perform 直接导入 +from keepnote.util.platform import translate +_ = translate +# _ = keepnote.py.translate def browse_file(parent, title, filename=None): """Callback for selecting file browser""" - - dialog = gtk.FileChooserDialog( - title, parent, - action=gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("Open"), gtk.RESPONSE_OK)) - dialog.set_transient_for(parent) - dialog.set_modal(True) - - # set the filename if it is fully specified + dialog = Gtk.FileChooserDialog( + title=title, + transient_for=parent, + modal=True + ) + dialog.add_button(_("_Cancel"), Gtk.ResponseType.CANCEL) + dialog.add_button(_("_Open"), Gtk.ResponseType.OK) + + # Set the filename if it is fully specified if filename and os.path.isabs(filename): dialog.set_filename(filename) + dialog.present() response = dialog.run() - if response == gtk.RESPONSE_OK and dialog.get_filename(): + if response == Gtk.ResponseType.OK and dialog.get_filename(): filename = unicode_gtk(dialog.get_filename()) else: filename = None dialog.destroy() - return filename - -class NodeIconDialog (object): - """Updates a notebook""" +class NodeIconDialog: + """Dialog for updating a notebook node's icon""" def __init__(self, app): self.app = app self.main_window = None self.node = None + self.builder = None + self.dialog = None + self.icon_entry = None + self.icon_open_entry = None + self.icon_image = None + self.icon_open_image = None + self.standard_iconview = None + self.notebook_iconview = None + self.quick_iconview = None + self.standard_iconlist = None + self.notebook_iconlist = None + self.quick_iconlist = None + self.iconviews = [] + self.iconlists = [] + self.iconview_signals = {} def show(self, node=None, window=None): - - # TODO: factor out main_window.get_notebook() calls + """Show the dialog""" self.main_window = window self.node = node - self.xml = gtk.glade.XML( - keepnote.gui.get_resource("rc", "keepnote.glade"), - "node_icon_dialog", - keepnote.GETTEXT_DOMAIN) - self.dialog = self.xml.get_widget("node_icon_dialog") - self.xml.signal_autoconnect(self) - self.dialog.connect("close", lambda w: - self.dialog.response(gtk.RESPONSE_CANCEL)) + # Load the UI file (replacing Glade with a GTK 4 UI file) + self.builder = Gtk.Builder() + self.builder.add_from_file(keepnote.gui.get_resource("rc", "keepnote.py.ui")) # Update to .ui file + self.builder.set_translation_domain(keepnote.GETTEXT_DOMAIN) + self.dialog = self.builder.get_object("node_icon_dialog") self.dialog.set_transient_for(self.main_window) - self.icon_entry = self.xml.get_widget("icon_entry") - self.icon_open_entry = self.xml.get_widget("icon_open_entry") - self.icon_image = self.xml.get_widget("icon_image") - self.icon_open_image = self.xml.get_widget("icon_open_image") + # Get widgets + self.icon_entry = self.builder.get_object("icon_entry") + self.icon_open_entry = self.builder.get_object("icon_open_entry") + self.icon_image = self.builder.get_object("icon_image") + self.icon_open_image = self.builder.get_object("icon_open_image") + self.standard_iconview = self.builder.get_object("standard_iconview") + self.notebook_iconview = self.builder.get_object("notebook_iconview") + self.quick_iconview = self.builder.get_object("quick_pick_iconview") - self.standard_iconview = self.xml.get_widget("standard_iconview") - self.notebook_iconview = self.xml.get_widget("notebook_iconview") - self.quick_iconview = self.xml.get_widget("quick_pick_iconview") - - self.standard_iconlist = gtk.ListStore(gtk.gdk.Pixbuf, str) - self.notebook_iconlist = gtk.ListStore(gtk.gdk.Pixbuf, str) - self.quick_iconlist = gtk.ListStore(gtk.gdk.Pixbuf, str) + # Initialize icon lists + self.standard_iconlist = Gtk.ListStore(GdkPixbuf.Pixbuf, str) + self.notebook_iconlist = Gtk.ListStore(GdkPixbuf.Pixbuf, str) + self.quick_iconlist = Gtk.ListStore(GdkPixbuf.Pixbuf, str) self.iconviews = [ self.standard_iconview, self.notebook_iconview, - self.quick_iconview] - + self.quick_iconview + ] self.iconlists = [ self.standard_iconlist, self.notebook_iconlist, - self.quick_iconlist] + self.quick_iconlist + ] - self.iconview_signals = {} + # Connect signals for icon views for iconview in self.iconviews: - self.iconview_signals[iconview] = \ - iconview.connect("selection-changed", - self.on_iconview_selection_changed) - - iconview.connect("item-activated", lambda w, it: - self.on_set_icon_button_clicked(w)) - + self.iconview_signals[iconview] = iconview.connect( + "selection-changed", self.on_iconview_selection_changed + ) + iconview.connect("item-activated", lambda w, path: self.on_set_icon_button_clicked(w)) + + # Connect dialog buttons + self.builder.get_object("set_icon_button").connect("clicked", self.on_set_icon_button_clicked) + self.builder.get_object("set_icon_open_button").connect("clicked", self.on_set_icon_open_button_clicked) + self.builder.get_object("icon_set_button").connect("clicked", self.on_icon_set_button_clicked) + self.builder.get_object("icon_open_set_button").connect("clicked", self.on_icon_open_set_button_clicked) + self.builder.get_object("add_quick_pick_button").connect("clicked", self.on_add_quick_pick_button_clicked) + self.builder.get_object("delete_icon_button").connect("clicked", self.on_delete_icon_button_clicked) + + # Set initial icon values if node: self.set_icon("icon", node.get_attr("icon", "")) self.set_icon("icon_open", node.get_attr("icon_open", "")) + # Populate icon views self.populate_iconview() - # run dialog + # Run dialog + self.dialog.present() response = self.dialog.run() icon_file = None icon_open_file = None - if response == gtk.RESPONSE_OK: - # icon filenames + if response == Gtk.ResponseType.OK: + # Get icon filenames icon_file = unicode_gtk(self.icon_entry.get_text()) icon_open_file = unicode_gtk(self.icon_open_entry.get_text()) - if icon_file.strip() == u"": - icon_file = u"" - if icon_open_file.strip() == u"": - icon_open_file = u"" + if icon_file.strip() == "": + icon_file = "" + if icon_open_file.strip() == "": + icon_open_file = "" self.dialog.destroy() - return icon_file, icon_open_file def get_quick_pick_icons(self): @@ -164,7 +155,6 @@ def func(model, path, it, user_data): icons.append(unicode_gtk(self.quick_iconlist.get_value(it, 1))) self.quick_iconlist.foreach(func, None) - return icons def get_notebook_icons(self): @@ -175,37 +165,36 @@ def func(model, path, it, user_data): icons.append(unicode_gtk(self.notebook_iconlist.get_value(it, 1))) self.notebook_iconlist.foreach(func, None) - return icons - def populate_iconlist(self, list, icons): + def populate_iconlist(self, iconlist, icons): + """Populate an icon list with icons""" for iconfile in icons: - filename = lookup_icon_filename( - self.main_window.get_notebook(), iconfile) + filename = lookup_icon_filename(self.main_window.get_notebook(), iconfile) if filename: try: - pixbuf = keepnote.gui.get_pixbuf(filename) - except gobject.GError: + pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename) + except gi.repository.GLib.GError: continue - list.append((pixbuf, iconfile)) + iconlist.append((pixbuf, iconfile)) def populate_iconview(self): """Show icons in iconview""" - # populate standard + # Populate standard icons self.populate_iconlist(self.standard_iconlist, builtin_icons) self.standard_iconview.set_model(self.standard_iconlist) - self.standard_iconview.set_pixbuf_column(0) + self.standard_iconview.set_pixbuf_column.ConcurrentModificationException(0) - # populate notebook - self.populate_iconlist(self.notebook_iconlist, - self.main_window.get_notebook().get_icons()) + # Populate notebook icons + self.populate_iconlist(self.notebook_iconlist, self.main_window.get_notebook().get_icons()) self.notebook_iconview.set_model(self.notebook_iconlist) self.notebook_iconview.set_pixbuf_column(0) - # populate quick pick icons + # Populate quick pick icons self.populate_iconlist( self.quick_iconlist, - self.main_window.get_notebook().pref.get_quick_pick_icons()) + self.main_window.get_notebook().pref.get_quick_pick_icons() + ) self.quick_iconview.set_model(self.quick_iconlist) self.quick_iconview.set_pixbuf_column(0) @@ -221,7 +210,7 @@ def get_iconview_selection(self): def on_iconview_selection_changed(self, iconview): """Callback for icon selection""" - # make selection mutually exclusive + # Make selection mutually exclusive for iconview2 in self.iconviews: if iconview2 != iconview: iconview2.handler_block(self.iconview_signals[iconview2]) @@ -230,25 +219,26 @@ def on_iconview_selection_changed(self, iconview): def on_delete_icon_button_clicked(self, widget): """Delete an icon from the notebook or quick picks""" - # delete quick pick + # Delete quick pick for path in self.quick_iconview.get_selected_items(): it = self.quick_iconlist.get_iter(path) self.quick_iconlist.remove(it) - # delete notebook icon + # Delete notebook icon for path in self.notebook_iconview.get_selected_items(): it = self.notebook_iconlist.get_iter(path) self.notebook_iconlist.remove(it) - # NOTE: cannot delete standard icon + # NOTE: Cannot delete standard icon def on_add_quick_pick_button_clicked(self, widget): - """Add a icon to the quick pick icons""" + """Add an icon to the quick pick icons""" iconview, icon, iconfile = self.get_iconview_selection() if iconview in (self.standard_iconview, self.notebook_iconview): self.quick_iconlist.append((icon, iconfile)) def set_icon(self, kind, filename): + """Set the icon for the specified kind ('icon' or 'icon_open')""" if kind == "icon": self.icon_entry.set_text(filename) else: @@ -260,29 +250,27 @@ def set_icon(self, kind, filename): self.set_preview(kind, filename) - # try to auto-set open icon filename + # Try to auto-set open icon filename if kind == "icon": if self.icon_open_entry.get_text().strip() == "": open_filename = guess_open_icon_filename(filename) - if os.path.isabs(open_filename) and \ - os.path.exists(open_filename): - # do a full set + if os.path.isabs(open_filename) and os.path.exists(open_filename): + # Do a full set self.set_icon("icon_open", open_filename) else: - # just do preview - if lookup_icon_filename(self.main_window.get_notebook(), - open_filename): + # Just do preview + if lookup_icon_filename(self.main_window.get_notebook(), open_filename): self.set_preview("icon_open", open_filename) else: self.set_preview("icon_open", filename) def set_preview(self, kind, filename): + """Set the preview image for the specified kind ('icon' or 'icon_open')""" if os.path.isabs(filename): filename2 = filename else: - filename2 = lookup_icon_filename(self.main_window.get_notebook(), - filename) + filename2 = lookup_icon_filename(self.main_window.get_notebook(), filename) if kind == "icon": self.icon_image.set_from_file(filename2) @@ -293,9 +281,7 @@ def on_icon_set_button_clicked(self, widget): """Callback for browse icon file""" filename = unicode_gtk(self.icon_entry.get_text()) filename = browse_file(self.dialog, _("Choose Icon"), filename) - if filename: - # set filename and preview self.set_icon("icon", filename) def on_icon_open_set_button_clicked(self, widget): @@ -303,15 +289,16 @@ def on_icon_open_set_button_clicked(self, widget): filename = unicode_gtk(self.icon_open_entry.get_text()) filename = browse_file(self.dialog, _("Choose Open Icon"), filename) if filename: - # set filename and preview self.set_icon("icon_open", filename) def on_set_icon_button_clicked(self, widget): + """Set the selected icon as the node's icon""" iconview, icon, iconfile = self.get_iconview_selection() if iconfile: self.set_icon("icon", iconfile) def on_set_icon_open_button_clicked(self, widget): + """Set the selected icon as the node's open icon""" iconview, icon, iconfile = self.get_iconview_selection() if iconfile: - self.set_icon("icon_open", iconfile) + self.set_icon("icon_open", iconfile) \ No newline at end of file diff --git a/keepnote/gui/dialog_update_notebook.py b/keepnote/gui/dialog_update_notebook.py index 70e060a74..c874e93ee 100644 --- a/keepnote/gui/dialog_update_notebook.py +++ b/keepnote/gui/dialog_update_notebook.py @@ -1,39 +1,11 @@ -""" - - KeepNote - Update notebook dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python 3 and PyGObject imports import sys import shutil +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade - -# keepnote imports +# KeepNote imports import keepnote from keepnote import unicode_gtk from keepnote.gui import dialog_wait @@ -44,44 +16,56 @@ _ = keepnote.translate - MESSAGE_TEXT = _("This notebook has format version %d and must be updated to " "version %d before opening.") - -class UpdateNoteBookDialog (object): - """Updates a notebook""" +class UpdateNoteBookDialog: + """Dialog for updating a notebook to a newer format version""" def __init__(self, app, main_window): self.main_window = main_window self.app = app + self.builder = None + self.dialog = None + self.text = None + self.saved = None def show(self, notebook_filename, version=None, task=None): - self.xml = gtk.glade.XML(get_resource("rc", "keepnote.glade"), - "update_notebook_dialog", - keepnote.GETTEXT_DOMAIN) - self.dialog = self.xml.get_widget("update_notebook_dialog") - self.xml.signal_autoconnect(self) - self.dialog.connect("close", lambda w: - self.dialog.response(gtk.RESPONSE_CANCEL)) + """Show the dialog to update the notebook""" + # Load the UI file (replacing Glade with a GTK 4 UI file) + self.builder = Gtk.Builder() + self.builder.add_from_file(get_resource("rc", "keepnote.py.ui")) # Update to .ui file + self.builder.set_translation_domain(keepnote.GETTEXT_DOMAIN) + self.dialog = self.builder.get_object("update_notebook_dialog") + # Add error handling to ensure dialog exists + if self.dialog is None: + print("Error: update_notebook_dialog not found in keepnote.py.ui") + return False + self.dialog.set_transient_for(self.main_window) - self.text = self.xml.get_widget("update_message_label") - self.saved = self.xml.get_widget("save_backup_check") + # Get widgets + self.text = self.builder.get_object("update_message_label") + self.saved = self.builder.get_object("save_backup_check") + + # Connect dialog buttons (assuming the .ui file defines these) + self.builder.get_object("cancel_button").connect("clicked", lambda w: self.dialog.response(Gtk.ResponseType.CANCEL)) + self.builder.get_object("ok_button").connect("clicked", lambda w: self.dialog.response(Gtk.ResponseType.OK)) + # Determine the notebook version if version is None: version = notebooklib.get_notebook_version(notebook_filename) - self.text.set_text(MESSAGE_TEXT % - (version, - notebooklib.NOTEBOOK_FORMAT_VERSION)) + # Set the message text + self.text.set_label(MESSAGE_TEXT % (version, notebooklib.NOTEBOOK_FORMAT_VERSION)) + # Run the dialog ret = False + self.dialog.present() response = self.dialog.run() - if response == gtk.RESPONSE_OK: - - # do backup + if response == Gtk.ResponseType.OK: + # Do backup if selected if self.saved.get_active(): if not self.backup(notebook_filename): self.dialog.destroy() @@ -89,19 +73,16 @@ def show(self, notebook_filename, version=None, task=None): self.dialog.destroy() - # do update + # Perform the update def func(task): - update.update_notebook( - notebook_filename, - notebooklib.NOTEBOOK_FORMAT_VERSION) + update.update_notebook(notebook_filename, notebooklib.NOTEBOOK_FORMAT_VERSION) - # TODO: reuse existing task + # Create a new task if none provided task = tasklib.Task(func) dialog2 = dialog_wait.WaitDialog(self.main_window) - dialog2.show(_("Updating Notebook"), - _("Updating notebook..."), - task, cancel=False) + dialog2.show(_("Updating Notebook"), _("Updating notebook..."), task, cancel=False) + # Check the result of the update ret = not task.aborted() ty, err, tb = task.exc_info() if err: @@ -110,54 +91,62 @@ def func(task): else: self.dialog.destroy() + # Show success message if update was successful if ret: - self.app.message(_("Notebook updated successfully"), - _("Notebook Update Complete"), - self.main_window) + self.app.message( + _("Notebook updated successfully"), + _("Notebook Update Complete"), + self.main_window + ) return ret def backup(self, notebook_filename): - + """Backup the notebook before updating""" dialog = FileChooserDialog( _("Choose Backup Notebook Name"), self.main_window, - action=gtk.FILE_CHOOSER_ACTION_SAVE, # CREATE_FOLDER, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("Backup"), gtk.RESPONSE_OK), + action=Gtk.FileChooserAction.SAVE, + buttons=( + _("Cancel"), Gtk.ResponseType.CANCEL, + _("Backup"), Gtk.ResponseType.OK + ), app=self.app, - persistent_path="new_notebook_path") + persistent_path="new_notebook_path" + ) + dialog.present() response = dialog.run() - new_filename = dialog.get_filename() dialog.destroy() - if response == gtk.RESPONSE_OK and new_filename: + if response == Gtk.ResponseType.OK and new_filename: new_filename = unicode_gtk(new_filename) def func(task): try: shutil.copytree(notebook_filename, new_filename) - except Exception, e: - print >>sys.stderr, e - print >>sys.stderr, "'%s' '%s'" % (notebook_filename, - new_filename) + except Exception as e: + print(e, file=sys.stderr) + print(f"'{notebook_filename}' '{new_filename}'", file=sys.stderr) raise + task = tasklib.Task(func) dialog2 = dialog_wait.WaitDialog(self.dialog) - dialog2.show(_("Backing Up Notebook"), - _("Backing up old notebook..."), - task, cancel=False) - - # handle errors + dialog2.show( + _("Backing Up Notebook"), + _("Backing up old notebook..."), + task, + cancel=False + ) + + # Handle errors if task.aborted(): ty, err, tb = task.exc_info() if err: - self.main_window.error(_("Error occurred during backup."), - err, tb) + self.main_window.error(_("Error occurred during backup."), err, tb) else: self.main_window.error(_("Backup canceled.")) return False - return True + return True \ No newline at end of file diff --git a/keepnote/gui/dialog_wait.py b/keepnote/gui/dialog_wait.py index 3b0d8a830..42d036bde 100644 --- a/keepnote/gui/dialog_wait.py +++ b/keepnote/gui/dialog_wait.py @@ -1,126 +1,124 @@ -""" - - KeepNote - General Wait Dialog - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python 3 and PyGObject imports import time +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, GLib -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade -import gobject - -# keepnote imports +# KeepNote imports import keepnote -from keepnote import get_resource - - -class WaitDialog (object): - """General dialog for background tasks""" +from keepnote.util.platform import get_resource +class WaitDialog: def __init__(self, parent_window): self.parent_window = parent_window self._task = None + self.builder = None + self.dialog = None + self.text = None + self.progressbar = None + self._timeout_id = None def show(self, title, message, task, cancel=True): - self.xml = gtk.glade.XML(get_resource("rc", "keepnote.glade"), - "wait_dialog", keepnote.GETTEXT_DOMAIN) - self.dialog = self.xml.get_widget("wait_dialog") - self.xml.signal_autoconnect(self) - self.dialog.connect("close", self._on_close) + # Load the UI file (replacing Glade with a GTK 4 UI file) + self.builder = Gtk.Builder() + self.builder.add_from_file(get_resource("rc", "keepnote.py.ui")) # Update to .ui file + self.builder.set_translation_domain(keepnote.GETTEXT_DOMAIN) + self.dialog = self.builder.get_object("wait_dialog") + self.dialog.connect("close-request", self._on_close) self.dialog.set_transient_for(self.parent_window) - self.text = self.xml.get_widget("wait_text_label") - self.progressbar = self.xml.get_widget("wait_progressbar") + # Get widgets + self.text = self.builder.get_object("wait_text_label") + self.progressbar = self.builder.get_object("wait_progressbar") + + # Connect cancel button + cancel_button = self.builder.get_object("wait_cancel_button") + cancel_button.connect("clicked", self.on_cancel_button_clicked) + + # Check content area for unexpected children + content_area = self.dialog.get_content_area() + children = content_area.get_first_child() + child_list = [] + while children: + child_list.append(children) + children = children.get_next_sibling() + if len(child_list) > 1: + print(f"Warning: WaitDialog has multiple children: {child_list}") + for child in child_list[1:]: + content_area.remove(child) + + # Set initial values self.dialog.set_title(title) - self.text.set_text(message) + self.text.set_label(message) self._task = task self._task.change_event.add(self._on_task_update) - cancel_button = self.xml.get_widget("cancel_button") + # Enable/disable cancel button cancel_button.set_sensitive(cancel) - self.dialog.show() + # Show the dialog and start the task + self.dialog.present() self._task.run() self._on_idle() self.dialog.run() self._task.join() + # Clean up self._task.change_event.remove(self._on_task_update) + if self._timeout_id: + GLib.source_remove(self._timeout_id) + self._timeout_id = None def _on_idle(self): - """Idle thread""" + """Idle function to update the UI""" lasttime = [time.time()] - pulse_rate = 0.5 # seconds per sweep - update_rate = 100 + pulse_rate = 0.5 # Seconds per sweep + update_rate = 100 # Milliseconds def gui_update(): - - # close dialog if task is stopped + # Close dialog if task is stopped if self._task.is_stopped(): self.dialog.destroy() - # do not repeat this timeout function - return False + return False # Stop the timeout - # update progress bar + # Update progress bar percent = self._task.get_percent() if percent is None: t = time.time() timestep = t - lasttime[0] lasttime[0] = t - step = max(min(timestep / pulse_rate, .1), .001) + step = max(min(timestep / pulse_rate, 0.1), 0.001) self.progressbar.set_pulse_step(step) self.progressbar.pulse() else: self.progressbar.set_fraction(percent) - # filter for messages we process - messages = filter(lambda x: isinstance(x, tuple) and len(x) == 2, - self._task.get_messages()) - texts = filter(lambda (a, b): a == "text", messages) - details = filter(lambda (a, b): a == "detail", messages) + # Filter for messages we process + messages = [x for x in self._task.get_messages() if isinstance(x, tuple) and len(x) == 2] + texts = [a_b for a_b in messages if a_b[0] == "text"] + details = [a_b for a_b in messages if a_b[0] == "detail"] - # update text - if len(texts) > 0: - self.text.set_text(texts[-1][1]) - if len(details) > 0: + # Update text + if texts: + self.text.set_label(texts[-1][1]) + if details: self.progressbar.set_text(details[-1][1]) - # repeat this timeout function - return True + return True # Continue the timeout - gobject.timeout_add(update_rate, gui_update) + # Use GLib.timeout_add to update the UI + self._timeout_id = GLib.timeout_add(update_rate, gui_update) def _on_task_update(self): + """Callback for task updates (currently a no-op)""" pass def _on_close(self, window): + """Handle dialog close event""" self._task.stop() + return True # Prevent default close behavior def on_cancel_button_clicked(self, button): - """Attempt to stop the task""" - self.text.set_text("Canceling...") - self._task.stop() + """Attempt to stop the task when the cancel button is clicked""" + self.text.set_label("Canceling...") + self._task.stop() \ No newline at end of file diff --git a/keepnote/gui/editor.py b/keepnote/gui/editor.py index c0252bf33..4b3399a1c 100644 --- a/keepnote/gui/editor.py +++ b/keepnote/gui/editor.py @@ -1,58 +1,31 @@ -""" - - KeepNote - Editor widget in main window - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade -import gobject - -# keepnote imports -import keepnote +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # GTK4 change +from gi.repository import Gtk, GObject, Gio # GTK4 change +# KeepNote imports +import keepnote _ = keepnote.translate - -class KeepNoteEditor (gtk.VBox): +class KeepNoteEditor(Gtk.Box): """ Base class for all KeepNoteEditors """ def __init__(self, app): - gtk.VBox.__init__(self, False, 0) + super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=0) # GTK4 change self._app = app self._notebook = None self._textview = None - self.show_all() + # self.show_all() # GTK4: deprecated and removed, omit safely def set_notebook(self, notebook): """Set notebook for editor""" + pass def get_textview(self): + """Return the textview widget""" return self._textview def is_focus(self): @@ -61,15 +34,19 @@ def is_focus(self): def grab_focus(self): """Pass focus to textview""" + pass def clear_view(self): """Clear editor view""" + pass def view_nodes(self, nodes): """View a node(s) in the editor""" + pass def save(self): """Save the loaded page""" + pass def save_needed(self): """Returns True if textview is modified""" @@ -77,38 +54,44 @@ def save_needed(self): def load_preferences(self, app_pref, first_open=False): """Load application preferences""" + pass def save_preferences(self, app_pref): """Save application preferences""" + pass def add_ui(self, window): + """Add UI elements to the window""" pass def remove_ui(self, window): + """Remove UI elements from the window""" pass def undo(self): + """Undo the last action""" pass def redo(self): + """Redo the last undone action""" pass -# add new signals to KeepNoteEditor -gobject.type_register(KeepNoteEditor) -gobject.signal_new("view-node", KeepNoteEditor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("visit-node", KeepNoteEditor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("modified", KeepNoteEditor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object, bool)) -gobject.signal_new("font-change", KeepNoteEditor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("error", KeepNoteEditor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str, object)) -gobject.signal_new("child-activated", KeepNoteEditor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object, object)) -gobject.signal_new("window-request", KeepNoteEditor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str,)) -gobject.signal_new("make-link", KeepNoteEditor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) +# Add new signals to KeepNoteEditor +GObject.type_register(KeepNoteEditor) +GObject.signal_new("view-node", KeepNoteEditor, GObject.SignalFlags.RUN_LAST, + None, (object,)) +GObject.signal_new("visit-node", KeepNoteEditor, GObject.SignalFlags.RUN_LAST, + None, (object,)) +GObject.signal_new("modified", KeepNoteEditor, GObject.SignalFlags.RUN_LAST, + None, (object, bool)) +GObject.signal_new("font-change", KeepNoteEditor, GObject.SignalFlags.RUN_LAST, + None, (object,)) +GObject.signal_new("error", KeepNoteEditor, GObject.SignalFlags.RUN_LAST, + None, (str, object)) +GObject.signal_new("child-activated", KeepNoteEditor, GObject.SignalFlags.RUN_LAST, + None, (object, object)) +GObject.signal_new("window-request", KeepNoteEditor, GObject.SignalFlags.RUN_LAST, + None, (str,)) +GObject.signal_new("make-link", KeepNoteEditor, GObject.SignalFlags.RUN_LAST, + None, ()) \ No newline at end of file diff --git a/keepnote/gui/editor_multi.py b/keepnote/gui/editor_multi.py index 828845efa..7221b71ae 100644 --- a/keepnote/gui/editor_multi.py +++ b/keepnote/gui/editor_multi.py @@ -1,76 +1,46 @@ -""" - - KeepNote - MultiEditor widget in main window - - This editor contain multiple editors that can be switched based on - the content-type of the node. - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') - -# keepnote imports +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk + +# KeepNote imports import keepnote from keepnote.gui.editor import KeepNoteEditor - _ = keepnote.translate - -class MultiEditor (KeepNoteEditor): +class MultiEditor(KeepNoteEditor): """ Manager for switching between multiple editors """ def __init__(self, app): - KeepNoteEditor.__init__(self, app) - self.show_all() + super().__init__(app) self._notebook = None self._nodes = [] self._editor = None self._window = None - self._signals = ["view-node", - "visit-node", - "modified", - "font-change", - "error", - "child-activated", - "window-request", - "make-link"] + self._signals = [ + "view-node", + "visit-node", + "modified", + "font-change", + "error", + "child-activated", + "window-request", + "make-link" + ] self._signal_ids = [] def set_editor(self, editor): """Set the current child editor""" - - # do nothing if editor is already set + # Do nothing if editor is already set if editor == self._editor: return - # tear down old editor, if it exists + # Tear down old editor, if it exists if self._editor: self._editor.view_nodes([]) self._editor.save_preferences(self._app.pref) @@ -82,16 +52,15 @@ def set_editor(self, editor): self._editor = editor - # start up new editor, if it exists + # Start up new editor, if it exists if self._editor: - self.pack_start(self._editor, True, True, 0) - self._editor.show() - self._connect_signals(self._editor) + self.append(self._editor) # Changed from pack_start to append self._editor.set_notebook(self._notebook) if self._window: self._editor.add_ui(self._window) self._editor.load_preferences(self._app.pref) self._editor.view_nodes(self._nodes) + self._connect_signals(self._editor) def get_editor(self): """Get the current child editor""" @@ -104,10 +73,11 @@ def make_callback(sig): for sig in self._signals: self._signal_ids.append( - editor.connect(sig, make_callback(sig))) + editor.connect(sig, make_callback(sig)) + ) def _disconnect_signals(self, editor): - """Disconnect al signals for child editor""" + """Disconnect all signals for child editor""" for sigid in self._signal_ids: editor.disconnect(sigid) self._signal_ids = [] @@ -193,13 +163,13 @@ def redo(self): return self._editor.redo() -class ContentEditor (MultiEditor): +class ContentEditor(MultiEditor): """ Register multiple editors depending on the content type """ def __init__(self, app): - MultiEditor.__init__(self, app) + super().__init__(app) self._editors = {} self._default_editor = None @@ -208,29 +178,34 @@ def add_editor(self, content_type, editor): """Add an editor for a content-type""" self._editors[content_type] = editor - def removed_editor(self, content_type): + def remove_editor(self, content_type): """Remove editor for a content-type""" - del self._editors[content_type] + if content_type in self._editors: + del self._editors[content_type] def get_editor_content(self, content_type): """Get editor associated with content-type""" - return self._editors[content_type] + return self._editors.get(content_type) def set_default_editor(self, editor): """Set the default editor""" self._default_editor = editor + # 在 ContentEditor 类中加上这个方法 + def get_widget(self): + return self._textview # 或者返回 Gtk.Box、Gtk.Widget 等视图控件 + #============================= # Editor Interface def view_nodes(self, nodes): - + """View nodes and select the appropriate editor based on content type""" if len(nodes) != 1: - MultiEditor.view_nodes(self, []) + super().view_nodes([]) else: - content_type = nodes[0].get_attr("content_type").split("/") + content_type = nodes[0].get_attr("content_type", "").split("/") - for i in xrange(len(content_type), 0, -1): + for i in range(len(content_type), 0, -1): editor = self._editors.get("/".join(content_type[:i]), None) if editor: self.set_editor(editor) @@ -238,4 +213,4 @@ def view_nodes(self, nodes): else: self.set_editor(self._default_editor) - MultiEditor.view_nodes(self, nodes) + super().view_nodes(nodes) \ No newline at end of file diff --git a/keepnote/gui/editor_richtext.py b/keepnote/gui/editor_richtext.py index 30be4bb91..d9f1c62bf 100644 --- a/keepnote/gui/editor_richtext.py +++ b/keepnote/gui/editor_richtext.py @@ -1,54 +1,20 @@ -""" - - KeepNote - Editor widget in main window - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python 3 and PyGObject imports import os import re +import gi +from gi.repository import GdkPixbuf -# pygtk imports -import pygtk -pygtk.require('2.0') -from gtk import gdk -import gtk.glade -import gobject +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, Gdk, GObject -# keepnote imports +# KeepNote imports import keepnote -from keepnote import \ - KeepNoteError, is_url, unicode_gtk -from keepnote.notebook import \ - NoteBookError, \ - get_node_url, \ - parse_node_url, \ - is_node_url +from keepnote import KeepNoteError, is_url +from keepnote.util.platform import unicode_gtk +from keepnote.notebook import NoteBookError, get_node_url, parse_node_url, is_node_url from keepnote import notebook as notebooklib from keepnote.gui import dialog_image_new -from keepnote.gui.richtext import \ - RichTextView, RichTextBuffer, \ - RichTextIO, RichTextError, RichTextImage +from keepnote.gui.richtext import RichTextView, RichTextBuffer, RichTextIO, RichTextError, RichTextImage from keepnote.gui.richtext.richtext_tags import RichTextLinkTag from keepnote.gui.icons import lookup_icon_filename from keepnote.gui.font_selector import FontSelector @@ -56,38 +22,28 @@ from keepnote.gui.linkcomplete import LinkPickerPopup from keepnote.gui.link_editor import LinkEditor from keepnote.gui.editor import KeepNoteEditor -from keepnote.gui import \ - CONTEXT_MENU_ACCEL_PATH, \ - DEFAULT_FONT, \ - DEFAULT_COLORS, \ - FileChooserDialog, \ - get_resource_pixbuf, \ - Action, \ - ToggleAction, \ - add_actions, \ - update_file_preview, \ - dialog_find, \ - dialog_image_resize - +from keepnote.gui import ( + CONTEXT_MENU_ACCEL_PATH, DEFAULT_FONT, DEFAULT_COLORS, + FileChooserDialog, get_resource_pixbuf, Action, ToggleAction, + add_actions, update_file_preview, dialog_find, dialog_image_resize +) _ = keepnote.translate - def is_relative_file(filename): """Returns True if filename is relative""" return (not re.match("[^:/]+://", filename) and not os.path.isabs(filename)) - def is_local_file(filename): + """Returns True if filename is a local file (no slashes)""" return filename and ("/" not in filename) and ("\\" not in filename) - -class NodeIO (RichTextIO): +class NodeIO(RichTextIO): """Read/Writes the contents of a RichTextBuffer to disk""" def __init__(self): - RichTextIO.__init__(self) + super().__init__() self._node = None self._image_files = set() self._saved_image_files = set() @@ -97,35 +53,34 @@ def set_node(self, node): def save(self, textbuffer, filename, title=None, stream=None): """Save buffer contents to file""" - RichTextIO.save(self, textbuffer, filename, title, stream=stream) + super().save(textbuffer, filename, title, stream=stream) def load(self, textview, textbuffer, filename, stream=None): - RichTextIO.load(self, textview, textbuffer, filename, stream=stream) + super().load(textview, textbuffer, filename, stream=stream) def _load_images(self, textbuffer, html_filename): """Load images present in textbuffer""" self._image_files.clear() - RichTextIO._load_images(self, textbuffer, html_filename) + super()._load_images(textbuffer, html_filename) def _save_images(self, textbuffer, html_filename): """Save images present in text buffer""" - # reset saved image set + # Reset saved image set self._saved_image_files.clear() - # don't allow the html file to be deleted + # Don't allow the html file to be deleted if html_filename: self._saved_image_files.add(os.path.basename(html_filename)) - RichTextIO._save_images(self, textbuffer, html_filename) + super()._save_images(textbuffer, html_filename) - # delete images not part of the saved set - self._delete_images(html_filename, - self._image_files - self._saved_image_files) + # Delete images not part of the saved set + self._delete_images(html_filename, self._image_files - self._saved_image_files) self._image_files = set(self._saved_image_files) def _delete_images(self, html_filename, image_files): for image_file in image_files: - # only delete an image file if it is local + # Only delete an image file if it is local if is_local_file(image_file): try: self._node.delete_file(image_file) @@ -134,7 +89,6 @@ def _delete_images(self, html_filename, image_files): pass def _load_image(self, textbuffer, image, html_filename): - # TODO: generalize url recognition filename = image.get_filename() if filename.startswith("http:/") or filename.startswith("file:/"): image.set_from_url(filename) @@ -148,7 +102,7 @@ def _load_image(self, textbuffer, image, html_filename): else: image.set_from_file(filename) - # record loaded images + # Record loaded images self._image_files.add(image.get_filename()) def _save_image(self, textbuffer, image, html_filename): @@ -157,75 +111,83 @@ def _save_image(self, textbuffer, image, html_filename): image.write_stream(out, image.get_filename()) out.close() - # mark image as saved + # Mark image as saved self._saved_image_files.add(image.get_filename()) - -class RichTextEditor (KeepNoteEditor): +class RichTextEditor(KeepNoteEditor): + """Rich text editor for KeepNote""" def __init__(self, app): - KeepNoteEditor.__init__(self, app) + super().__init__(app) self._app = app + if self._app is None: + print("ERROR: _app is not initialized.") + return + tag_table = self._app.get_richtext_tag_table() # Get the GtkTextTagTable + if isinstance(tag_table, Gtk.TextTagTable): + self._rich_buffer = RichTextBuffer(tag_table) # ✅ 创建 RichTextBuffer 实例 + self._textview = RichTextView(self._rich_buffer.get_buffer()) # ✅ 传入 Gtk.TextBuffer 实例 + + else: + print("ERROR: Invalid tag table") + return self._notebook = None self._link_picker = None - self._maxlinks = 10 # maximum number of links to show in link picker + self._maxlinks = 10 # Maximum number of links to show in link picker - # state - self._page = None # current NoteBookPage - self._page_scrolls = {} # remember scroll in each page + # State + self._page = None + self._page_scrolls = {} self._page_cursors = {} self._textview_io = NodeIO() - # editor + # Editor self.connect("make-link", self._on_make_link) - # textview and its callbacks - self._textview = RichTextView(RichTextBuffer( - self._app.get_richtext_tag_table())) # textview + # Textview and its callbacks + self._textview = RichTextView(RichTextBuffer(self._app.get_richtext_tag_table())) self._textview.disable() self._textview.connect("font-change", self._on_font_callback) self._textview.connect("modified", self._on_modified_callback) self._textview.connect("child-activated", self._on_child_activated) self._textview.connect("visit-url", self._on_visit_url) - self._textview.get_buffer().connect("ending-user-action", - self._on_text_changed) - self._textview.connect("key-press-event", self._on_key_press_event) - - # scrollbars - self._sw = gtk.ScrolledWindow() - self._sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self._sw.set_shadow_type(gtk.SHADOW_IN) - self._sw.add(self._textview) - self.pack_start(self._sw) - - # link editor + self._textview.get_buffer().connect("end-user-action", self._on_text_changed) + + # Replace key-press-event with EventControllerKey + key_controller = Gtk.EventControllerKey.new() + key_controller.connect("key-pressed", self._on_key_press_event) + self._textview.add_controller(key_controller) + + # Scrollbars + self._sw = Gtk.ScrolledWindow() + self._sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + self._sw.set_has_frame(True) # Replaces set_shadow_type + self._sw.set_child(self._textview) # Changed from add to set_child + self.append(self._sw) # Changed from pack_start to append + + # Link editor self._link_editor = LinkEditor() self._link_editor.set_textview(self._textview) self._link_editor.set_search_nodes(self._search_nodes) self.connect("font-change", self._link_editor.on_font_change) - self.pack_start(self._link_editor, False, True, 0) + self.append(self._link_editor) # Changed from pack_start to append self.make_image_menu(self._textview.get_image_menu()) - # menus + # Menus self.editor_menus = EditorMenus(self._app, self) self.connect("font-change", self.editor_menus.on_font_change) - # find dialog + # Find dialog self.find_dialog = dialog_find.KeepNoteFindDialog(self) - self.show_all() - def set_notebook(self, notebook): """Set notebook for editor""" - # set new notebook self._notebook = notebook - if self._notebook: self.load_notebook_preferences() else: - # no new notebook, clear the view self.clear_view() def get_notebook(self): @@ -235,8 +197,7 @@ def get_notebook(self): def load_preferences(self, app_pref, first_open=False): """Load application preferences""" self.editor_menus.enable_spell_check( - app_pref.get("editors", "general", "spell_check", - default=True)) + app_pref.get("editors", "general", "spell_check", default=True)) try: format = app_pref.get("editors", "general", "quote_format") @@ -248,7 +209,6 @@ def load_preferences(self, app_pref, first_open=False): def save_preferences(self, app_pref): """Save application preferences""" - # record state in preferences app_pref.set("editors", "general", "spell_check", self._textview.is_spell_check_enabled()) app_pref.set("editors", "general", "quote_format", @@ -257,14 +217,12 @@ def save_preferences(self, app_pref): def load_notebook_preferences(self): """Load notebook-specific preferences""" if self._notebook: - # read default font self._textview.set_default_font( - self._notebook.pref.get("default_font", - default=DEFAULT_FONT)) + self._notebook.pref.get("default_font", default=DEFAULT_FONT)) def is_focus(self): """Return True if text editor has focus""" - return self._textview.is_focus() + return self._textview.has_focus() def grab_focus(self): """Pass focus to textview""" @@ -285,102 +243,77 @@ def redo(self): def view_nodes(self, nodes): """View a page in the editor""" - - # editor cannot view multiple nodes at once - # if asked to, it will view none if len(nodes) > 1: nodes = [] - # save current page before changing nodes self.save() self._save_cursor() - pages = [node for node in nodes - if node.get_attr("content_type") == - notebooklib.CONTENT_TYPE_PAGE] + pages = [node for node in nodes if node.get_attr("content_type") == notebooklib.CONTENT_TYPE_PAGE] - if len(pages) == 0: + if not pages: self.clear_view() - else: page = pages[0] self._page = page self._textview.enable() try: - self._textview.set_current_url(page.get_url(), - title=page.get_title()) + self._textview.set_current_url(page.get_url(), title=page.get_title()) self._textview_io.set_node(self._page) self._textview_io.load( self._textview, self._textview.get_buffer(), self._page.get_page_file(), - stream=self._page.open_file( - self._page.get_page_file(), "r", "utf-8")) + stream=self._page.open_file(self._page.get_page_file(), "r", "utf-8") + ) self._load_cursor() - - except RichTextError, e: + except RichTextError as e: self.clear_view() self.emit("error", e.msg, e) - except Exception, e: + except Exception as e: self.clear_view() self.emit("error", "Unknown error", e) - if len(pages) > 0: + if pages: self.emit("view-node", pages[0]) def _save_cursor(self): if self._page is not None: - it = self._textview.get_buffer().get_insert_iter() + it = self._textview.get_buffer().get_iter_at_mark(self._textview.get_buffer().get_insert()) self._page_cursors[self._page] = it.get_offset() - x, y = self._textview.window_to_buffer_coords( - gtk.TEXT_WINDOW_TEXT, 0, 0) + x, y = self._textview.window_to_buffer_coords(Gtk.TextWindowType.TEXT, 0, 0) it = self._textview.get_iter_at_location(x, y) self._page_scrolls[self._page] = it.get_offset() def _load_cursor(self): - - # place cursor in last location if self._page in self._page_cursors: offset = self._page_cursors[self._page] it = self._textview.get_buffer().get_iter_at_offset(offset) self._textview.get_buffer().place_cursor(it) - # place scroll in last position if self._page in self._page_scrolls: offset = self._page_scrolls[self._page] buf = self._textview.get_buffer() it = buf.get_iter_at_offset(offset) mark = buf.create_mark(None, it, True) - self._textview.scroll_to_mark( - mark, 0.49, use_align=True, xalign=0.0) + self._textview.scroll_to_mark(mark, 0.49, True, 0.0, 0.0) buf.delete_mark(mark) def save(self): """Save the loaded page""" - - if self._page is not None and \ - self._page.is_valid() and \ - self._textview.is_modified(): - + if self._page is not None and self._page.is_valid() and self._textview.is_modified(): try: - # save text data self._textview_io.save( self._textview.get_buffer(), self._page.get_page_file(), self._page.get_title(), - stream=self._page.open_file( - self._page.get_page_file(), "w", "utf-8")) - - # save meta data + stream=self._page.open_file(self._page.get_page_file(), "w", "utf-8") + ) self._page.set_attr_timestamp("modified_time") self._page.save() - - except RichTextError, e: - self.emit("error", e.msg, e) - - except NoteBookError, e: + except (RichTextError, NoteBookError) as e: self.emit("error", e.msg, e) def save_needed(self): @@ -390,224 +323,149 @@ def save_needed(self): def add_ui(self, window): self._textview.set_accel_group(window.get_accel_group()) self._textview.set_accel_path(CONTEXT_MENU_ACCEL_PATH) - self._textview.get_image_menu().set_accel_group( - window.get_accel_group()) - + self._textview.get_image_menu().set_accel_group(window.get_accel_group()) self.editor_menus.add_ui(window) def remove_ui(self, window): self.editor_menus.remove_ui(window) - #=========================================== - # callbacks for textview - + # Callbacks for textview def _on_font_callback(self, textview, font): - """Callback for textview font changed""" self.emit("font-change", font) self._check_link(False) def _on_modified_callback(self, textview, modified): - """Callback for textview modification""" self.emit("modified", self._page, modified) - - # make notebook node modified if modified: self._page.mark_modified() self._page.notify_change(False) def _on_child_activated(self, textview, child): - """Callback for activation of textview child widget""" self.emit("child-activated", textview, child) - def _on_text_changed(self, textview): - """Callback for textview text change""" + def _on_text_changed(self, textbuffer): self._check_link() - def _on_key_press_event(self, textview, event): - """Callback for keypress in textview""" - - # decide if keypress should be forwarded to link picker + def _on_key_press_event(self, controller, keyval, keycode, state): if (self._link_picker and self._link_picker.shown() and - (event.keyval == gtk.keysyms.Down or - event.keyval == gtk.keysyms.Up or - event.keyval == gtk.keysyms.Return or - event.keyval == gtk.keysyms.Escape)): - - return self._link_picker.on_key_press_event(textview, event) + keyval in (Gdk.KEY_Down, Gdk.KEY_Up, Gdk.KEY_Return, Gdk.KEY_Escape)): + return self._link_picker.on_key_press_event(self._textview, keyval, keycode, state) + return False def _on_visit_url(self, textview, url): - """Callback for textview visiting a URL""" - if is_node_url(url): host, nodeid = parse_node_url(url) node = self._notebook.get_node_by_id(nodeid) if node: self.emit("visit-node", node) - else: try: self._app.open_webpage(url) - except KeepNoteError, e: + except KeepNoteError as e: self.emit("error", e.msg, e) def _on_make_link(self, editor): - """Callback from editor to make a link""" self._link_editor.edit() - #===================================== - # callback for link editor - + # Callback for link editor def _search_nodes(self, text): - """Return nodes with titles containing 'text'""" - - # TODO: make proper interface - nodes = [(nodeid, title) - for nodeid, title in self._notebook.search_node_titles(text)] + nodes = [(nodeid, title) for nodeid, title in self._notebook.search_node_titles(text)] return nodes - #====================================== - # link auto-complete - + # Link auto-complete def _check_link(self, popup=True): - """Check whether complete should be shown for link under cursor""" - # get link tag, start, end = self._textview.get_link() - if tag is not None and popup: - # perform node search text = start.get_text(end) results = [] - - # TODO: clean up icon handling. - for nodeid, title in self._notebook.search_node_titles(text)[ - :self._maxlinks]: + for nodeid, title in self._notebook.search_node_titles(text)[:self._maxlinks]: icon = self._notebook.get_attr_by_id(nodeid, "icon") if icon is None: icon = "note.png" icon = lookup_icon_filename(self._notebook, icon) if icon is None: icon = lookup_icon_filename(self._notebook, "note.png") - pb = keepnote.gui.get_pixbuf(icon) - - #if node is not None: results.append((get_node_url(nodeid), title, pb)) - # offer url match if is_url(text): - results = [(text, text, - get_resource_pixbuf(u"node_icons", - u"web.png"))] + results + results = [(text, text, get_resource_pixbuf("node_icons", "web.png"))] + results - # ensure link picker is initialized if self._link_picker is None: self._link_picker = LinkPickerPopup(self._textview) self._link_picker.connect("pick-link", self._on_pick_link) - # set results self._link_picker.set_links(results) - # move picker to correct location - if len(results) > 0: + if results: rect = self._textview.get_iter_location(start) - x, y = self._textview.buffer_to_window_coords( - gtk.TEXT_WINDOW_WIDGET, rect.x, rect.y) + x, y = self._textview.buffer_to_window_coords(Gtk.TextWindowType.WIDGET, rect.x, rect.y) rect = self._textview.get_iter_location(end) - _, y = self._textview.buffer_to_window_coords( - gtk.TEXT_WINDOW_WIDGET, rect.x, rect.y) - - self._link_picker.move_on_parent(x, y + rect.height, y) - + _, y_end = self._textview.buffer_to_window_coords(Gtk.TextWindowType.WIDGET, rect.x, rect.y) + self._link_picker.move_on_parent(x, y + rect.height, y_end) elif self._link_picker: self._link_picker.set_links([]) def _on_pick_link(self, widget, title, url): - """Callback for when link autocomplete has choosen a link""" - - # get current link tag, start, end = self._textview.get_link() - - # make new link tag tagname = RichTextLinkTag.tag_name(url) tag = self._textview.get_buffer().tag_table.lookup(tagname) - # remember the start iter offset = start.get_offset() self._textview.get_buffer().delete(start, end) - # replace link text with node title it = self._textview.get_buffer().get_iter_at_offset(offset) self._textview.get_buffer().place_cursor(it) self._textview.get_buffer().insert_at_cursor(title) - # get new start and end iters - end = self._textview.get_buffer().get_insert_iter() + end = self._textview.get_buffer().get_iter_at_mark(self._textview.get_buffer().get_insert()) start = self._textview.get_buffer().get_iter_at_offset(offset) - # set link tag self._textview.set_link(url, start, end) - - # exit link mode self._textview.get_buffer().font_handler.clear_current_tag_class(tag) - #================================================== # Image/screenshot actions - def on_screenshot(self): - """Take and insert a screen shot image""" - # do nothing if no page is selected if self._page is None: return imgfile = "" - - # Minimize window self.emit("window-request", "minimize") try: - imgfile = self._app.take_screenshot("keepnote") + imgfile = self._app.take_screenshot("keepnote.py") self.emit("window-request", "restore") - - # insert image self.insert_image(imgfile, "screenshot.png") - - except Exception, e: - # catch exceptions for screenshot program + except Exception as e: self.emit("window-request", "restore") - self.emit("error", - _("The screenshot program encountered an error:\n %s") - % str(e), e) + self.emit("error", _("The screenshot program encountered an error:\n %s") % str(e), e) - # remove temp file try: if os.path.exists(imgfile): os.remove(imgfile) - except OSError, e: - self.emit("error", - _("%s was unable to remove temp file for screenshot") % - keepnote.PROGRAM_NAME) + except OSError as e: + self.emit("error", _("%s was unable to remove temp file for screenshot") % keepnote.PROGRAM_NAME) def on_insert_hr(self): - """Insert horizontal rule into editor""" if self._page is None: return self._textview.insert_hr() def on_insert_image(self): - """Displays the Insert Image Dialog""" if self._page is None: return dialog = FileChooserDialog( _("Insert Image From File"), self.get_toplevel(), - action=gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("Insert"), gtk.RESPONSE_OK), + action=Gtk.FileChooserAction.OPEN, app=self._app, - persistent_path="insert_image_path") + persistent_path="insert_image_path" + ) + dialog.add_button(_("_Cancel"), Gtk.ResponseType.CANCEL) + dialog.add_button(_("_Insert"), Gtk.ResponseType.OK) - # add image filters - filter = gtk.FileFilter() + # Add image filters + filter = Gtk.FileFilter() filter.set_name("Images") filter.add_mime_type("image/png") filter.add_mime_type("image/jpeg") @@ -619,174 +477,131 @@ def on_insert_image(self): filter.add_pattern("*.xpm") dialog.add_filter(filter) - filter = gtk.FileFilter() + filter = Gtk.FileFilter() filter.set_name("All files") filter.add_pattern("*") dialog.add_filter(filter) - # setup preview - preview = gtk.Image() + # Setup preview + preview = Gtk.Image() dialog.set_preview_widget(preview) dialog.connect("update-preview", update_file_preview, preview) - # run dialog - response = dialog.run() - - if response == gtk.RESPONSE_OK: + dialog.present() + response = dialog.run_blocking() # Updated for GTK 4 + if response == Gtk.ResponseType.OK: filename = unicode_gtk(dialog.get_filename()) dialog.destroy() if filename is None: return - # TODO: do I need this? imgname, ext = os.path.splitext(os.path.basename(filename)) - if ext.lower() in (u".jpg", u".jpeg"): - ext = u".jpg" + if ext.lower() in (".jpg", ".jpeg"): + ext = ".jpg" else: - ext = u".png" + ext = ".png" imgname2 = self._page.new_filename(imgname, ext=ext) try: self.insert_image(filename, imgname2) - except Exception, e: - # TODO: make exception more specific - self.emit("error", - _("Could not insert image '%s'") % filename, e) + except Exception as e: + self.emit("error", _("Could not insert image '%s'") % filename, e) else: dialog.destroy() - def insert_image(self, filename, savename=u"image.png"): - """Inserts an image into the text editor""" + def insert_image(self, filename, savename="image.png"): if self._page is None: return img = RichTextImage() - img.set_from_pixbuf(gdk.pixbuf_new_from_file(filename)) + img.set_from_pixbuf(GdkPixbuf.Pixbuf.new_from_file(filename)) self._textview.insert_image(img, savename) - #================================================= # Image context menu - def view_image(self, image_filename): - current_page = self._page - if current_page is None: + if self._page is None: return - image_path = os.path.join(current_page.get_path(), image_filename) + image_path = os.path.join(self._page.get_path(), image_filename) self._app.run_external_app("image_viewer", image_path) - def _on_view_image(self, menuitem): - """View image in Image Viewer""" - # get image filename - image_filename = menuitem.get_parent().get_child().get_filename() + def _on_view_image(self, button): + image_filename = self._textview.get_image_menu().get_child().get_filename() self.view_image(image_filename) - def _on_edit_image(self, menuitem): - """Edit image in Image Editor""" - current_page = self._page - if current_page is None: + def _on_edit_image(self, button): + if self._page is None: return - # get image filename - image_filename = menuitem.get_parent().get_child().get_filename() - image_path = os.path.join(current_page.get_path(), image_filename) + image_filename = self._textview.get_image_menu().get_child().get_filename() + image_path = os.path.join(self._page.get_path(), image_filename) self._app.run_external_app("image_editor", image_path) - def _on_resize_image(self, menuitem): - """Resize image""" - - current_page = self._page - if current_page is None: + def _on_resize_image(self, button): + if self._page is None: return - image = menuitem.get_parent().get_child() - image_resize_dialog = \ - dialog_image_resize.ImageResizeDialog(self.get_toplevel(), - self._app.pref) + image = self._textview.get_image_menu().get_child() + image_resize_dialog = dialog_image_resize.ImageResizeDialog(self.get_toplevel(), self._app.pref) image_resize_dialog.on_resize(image) def _on_new_image(self): - """New image""" - current_page = self._page - if current_page is None: + if self._page is None: return dialog = dialog_image_new.NewImageDialog(self, self._app) dialog.show() - def _on_save_image_as(self, menuitem): - """Save image as a new file""" - current_page = self._page - if current_page is None: + def _on_save_image_as(self, button): + if self._page is None: return - # get image filename - image = menuitem.get_parent().get_child() + image = self._textview.get_image_menu().get_child() dialog = FileChooserDialog( _("Save Image As..."), self.get_toplevel(), - action=gtk.FILE_CHOOSER_ACTION_SAVE, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("Save"), gtk.RESPONSE_OK), + action=Gtk.FileChooserAction.SAVE, app=self._app, - persistent_path="save_image_path") - dialog.set_default_response(gtk.RESPONSE_OK) - response = dialog.run() + persistent_path="save_image_path" + ) + dialog.add_button(_("_Cancel"), Gtk.ResponseType.CANCEL) + dialog.add_button(_("_Save"), Gtk.ResponseType.OK) + dialog.set_default_response(Gtk.ResponseType.OK) + dialog.present() + response = dialog.run_blocking() # Updated for GTK 4 - if response == gtk.RESPONSE_OK: + if response == Gtk.ResponseType.OK: if not dialog.get_filename(): - self.emit("error", _("Must specify a filename for the image."), - None) + self.emit("error", _("Must specify a filename for the image."), None) else: filename = unicode_gtk(dialog.get_filename()) try: image.write(filename) except Exception: - self.emit("error", _("Could not save image '%s'.") - % filename, None) - + self.emit("error", _("Could not save image '%s'.") % filename, None) dialog.destroy() def make_image_menu(self, menu): - """image context menu""" - - # TODO: convert into UIManager? - # TODO: move to EditorMenus? - # TODO: add accelerators back - menu.set_accel_path(CONTEXT_MENU_ACCEL_PATH) - item = gtk.SeparatorMenuItem() - item.show() - menu.append(item) - - # image/edit - item = gtk.MenuItem(_("_View Image...")) - item.connect("activate", self._on_view_image) - item.child.set_markup_with_mnemonic(_("_View Image...")) - item.show() - menu.append(item) - - item = gtk.MenuItem(_("_Edit Image...")) - item.connect("activate", self._on_edit_image) - item.show() - menu.append(item) - - item = gtk.MenuItem(_("_Resize Image...")) - item.connect("activate", self._on_resize_image) - item.show() - menu.append(item) - - # image/save - item = gtk.ImageMenuItem(_("_Save Image As...")) - item.connect("activate", self._on_save_image_as) - item.show() - menu.append(item) - - -class FontUI (object): - - def __init__(self, widget, signal, update_func=lambda ui, font: None, - block=None, unblock=None): + """Image context menu""" + menu_box = menu.get_child() # Get the existing Gtk.Box + menu_box.append(Gtk.Separator()) # Add separator + + for label, callback in [ + (_("_View Image..."), self._on_view_image), + (_("_Edit Image..."), self._on_edit_image), + (_("_Resize Image..."), self._on_resize_image), + (_("_Save Image As..."), self._on_save_image_as), + ]: + item = Gtk.Button(label=label) + item.connect("clicked", callback) + if label == _("_View Image..."): + item.set_label(f"{label}") # Bold for View Image + menu_box.append(item) + + +class FontUI: + def __init__(self, widget, signal, update_func=lambda ui, font: None, block=None, unblock=None): self.widget = widget self.signal = signal self.update_func = update_func @@ -801,688 +616,227 @@ def __init__(self, widget, signal, update_func=lambda ui, font: None, else: self.unblock = unblock - -class EditorMenus (gobject.GObject): - +class EditorMenus: def __init__(self, app, editor): - gobject.GObject.__init__(self) - self._editor = editor self._app = app self._action_group = None self._uis = [] - self._font_ui_signals = [] # list of font ui widgets + self._font_ui_signals = [] self.spell_check_toggle = None - self._removed_widgets = [] - #============================================================= - # Update UI (menubar) from font under cursor - def on_font_change(self, editor, font): - """Update the toolbar reflect the font under the cursor""" - # block toolbar handlers for ui in self._font_ui_signals: ui.block() - - # call update callback for ui in self._font_ui_signals: ui.update_func(ui, font) - - # unblock toolbar handlers for ui in self._font_ui_signals: ui.unblock() - #================================================== - # changing font handlers - + # Font changing handlers def _on_mod(self, mod): - """Toggle a font modification""" self._editor.get_textview().toggle_font_mod(mod) def _on_toggle_link(self): - """Link mode has been toggled""" textview = self._editor.get_textview() textview.toggle_link() tag, start, end = textview.get_link() - if tag is not None: url = start.get_text(end) if tag.get_href() == "" and is_url(url): - # set default url to link text textview.set_link(url, start, end) self._editor.emit("make-link") def _on_justify(self, justify): - """Set font justification""" self._editor.get_textview().set_justify(justify) - #font = self._editor.get_textview().get_font() - #self.on_font_change(self._editor, font) def _on_bullet_list(self): - """Toggle bullet list""" self._editor.get_textview().toggle_bullet() - #font = self._editor.get_textview().get_font() - #self.on_font_change(self._editor, font) def _on_indent(self): - """Indent current paragraph""" self._editor.get_textview().indent() def _on_unindent(self): - """Unindent current paragraph""" self._editor.get_textview().unindent() def _on_family_set(self, font_family_combo): - """Set the font family""" - self._editor.get_textview().set_font_family( - font_family_combo.get_family()) + self._editor.get_textview().set_font_family(font_family_combo.get_active_text()) self._editor.get_textview().grab_focus() def _on_font_size_change(self, size): - """Set the font size""" self._editor.get_textview().set_font_size(size) self._editor.get_textview().grab_focus() def _on_font_size_inc(self): - """Increase font size""" font = self._editor.get_textview().get_font() font.size += 2 self._editor.get_textview().set_font_size(font.size) - #self.on_font_change(self._editor, font) def _on_font_size_dec(self): - """Decrease font size""" font = self._editor.get_textview().get_font() if font.size > 4: font.size -= 2 self._editor.get_textview().set_font_size(font.size) - #self.on_font_change(self._editor, font) def _on_color_set(self, kind, widget, color=0): - """Set text/background color""" if color == 0: color = widget.color - if kind == "fg": self._editor.get_textview().set_font_fg_color(color) elif kind == "bg": self._editor.get_textview().set_font_bg_color(color) else: - raise Exception("unknown color type '%s'" % str(kind)) + raise Exception(f"unknown color type '{kind}'") def _on_colors_set(self, colors): - """Set color pallete""" - # save colors notebook = self._editor._notebook if notebook: notebook.pref.set("colors", list(colors)) notebook.set_preferences_dirty() - self._app.get_listeners("colors_changed").notify(notebook, colors) def _on_choose_font(self): - """Callback for opening Choose Font Dialog""" font = self._editor.get_textview().get_font() + dialog = Gtk.FontDialog(title=_("Choose Font")) + dialog.select_font(None, f"{font.family} {font.size}", self._on_font_selected) + dialog.present() - dialog = gtk.FontSelectionDialog(_("Choose Font")) - dialog.set_font_name("%s %d" % (font.family, font.size)) - response = dialog.run() - - if response == gtk.RESPONSE_OK: - self._editor.get_textview().set_font(dialog.get_font_name()) + def _on_font_selected(self, dialog, result): + try: + font_desc = dialog.select_font_finish(result) + self._editor.get_textview().set_font(font_desc.to_string()) self._editor.get_textview().grab_focus() + except: + pass # User canceled or error occurred - dialog.destroy() - - #======================================================= - # spellcheck - + # Spellcheck def enable_spell_check(self, enabled): - """Spell check""" self._editor.get_textview().enable_spell_check(enabled) - - # see if spell check became enabled enabled = self._editor.get_textview().is_spell_check_enabled() - - # update UI to match if self.spell_check_toggle: self.spell_check_toggle.set_active(enabled) - return enabled def on_spell_check_toggle(self, widget): - """Toggle spell checker""" self.enable_spell_check(widget.get_active()) - #===================================================== - # toolbar and menus - + # Toolbar and menus (GTK 4 replacement for UIManager) def add_ui(self, window): - self._action_group = gtk.ActionGroup("Editor") - self._uis = [] - add_actions(self._action_group, self.get_actions()) - window.get_uimanager().insert_action_group( - self._action_group, 0) - - for s in self.get_ui(): - self._uis.append(window.get_uimanager().add_ui_from_string(s)) - window.get_uimanager().ensure_update() - - self.setup_menu(window, window.get_uimanager()) + # Placeholder for GTK 4 menu/toolbar implementation + print("Warning: add_ui needs to be reimplemented for GTK 4 using GMenu or manual widgets") + pass def remove_ui(self, window): - - # disconnect signals - for ui in self._font_ui_signals: - ui.widget.disconnect(ui.signal) - self._font_ui_signals = [] - - # remove ui - for ui in reversed(self._uis): - window.get_uimanager().remove_ui(ui) - self._uis = [] - #window.get_uimanager().ensure_update() - - # remove action group - window.get_uimanager().remove_action_group(self._action_group) - self._action_group = None + print("Warning: remove_ui needs to be reimplemented for GTK 4") + pass def get_actions(self): - def BothAction(name1, *args): return [Action(name1, *args), ToggleAction(name1 + " Tool", *args)] - return (map(lambda x: Action(*x), [ - ("Insert Horizontal Rule", None, _("Insert _Horizontal Rule"), - "H", None, - lambda w: self._editor.on_insert_hr()), - - ("Insert Image", None, _("Insert _Image..."), - "", None, - lambda w: self._editor.on_insert_image()), - - ("Insert New Image", None, _("Insert _New Image..."), - "", _("Insert a new image"), - lambda w: self._on_new_image()), - - ("Insert Screenshot", None, _("Insert _Screenshot..."), - "Insert", None, - lambda w: self._editor.on_screenshot()), - - # finding - ("Find In Page", gtk.STOCK_FIND, _("_Find In Page..."), - "F", None, - lambda w: self._editor.find_dialog.on_find(False)), - - ("Find Next In Page", gtk.STOCK_FIND, _("Find _Next In Page..."), - "G", None, - lambda w: self._editor.find_dialog.on_find(False, forward=True)), - - ("Find Previous In Page", gtk.STOCK_FIND, - _("Find Pre_vious In Page..."), - "G", None, - lambda w: self._editor.find_dialog.on_find(False, forward=False)), - - ("Replace In Page", gtk.STOCK_FIND_AND_REPLACE, - _("_Replace In Page..."), - "R", None, - lambda w: self._editor.find_dialog.on_find(True)), - - ("Format", None, _("Fo_rmat"))]) + - - BothAction("Bold", gtk.STOCK_BOLD, _("_Bold"), - "B", _("Bold"), - lambda w: self._on_mod("bold"), - "bold.png") + - - BothAction("Italic", gtk.STOCK_ITALIC, _("_Italic"), - "I", _("Italic"), - lambda w: self._on_mod("italic"), - "italic.png") + - - BothAction("Underline", gtk.STOCK_UNDERLINE, _("_Underline"), - "U", _("Underline"), - lambda w: self._on_mod("underline"), - "underline.png") + - - BothAction("Strike", None, _("S_trike"), - "", _("Strike"), - lambda w: self._on_mod("strike"), - "strike.png") + - - BothAction("Monospace", None, _("_Monospace"), - "M", _("Monospace"), - lambda w: self._on_mod("tt"), - "fixed-width.png") + - - BothAction("Link", None, _("Lin_k"), - "L", _("Make Link"), - lambda w: self._on_toggle_link(), - "link.png") + - - BothAction("No Wrapping", None, _("No _Wrapping"), - "", _("No Wrapping"), - lambda w: self._on_mod("nowrap"), - "no-wrap.png") + - - BothAction("Left Align", None, _("_Left Align"), - "L", _("Left Align"), - lambda w: self._on_justify("left"), - "alignleft.png") + - - BothAction("Center Align", None, _("C_enter Align"), - "E", _("Center Align"), - lambda w: self._on_justify("center"), - "aligncenter.png") + - - BothAction("Right Align", None, _("_Right Align"), - "R", _("Right Align"), - lambda w: self._on_justify("right"), - "alignright.png") + - - BothAction("Justify Align", None, _("_Justify Align"), - "J", _("Justify Align"), - lambda w: self._on_justify("fill"), - "alignjustify.png") + - - BothAction("Bullet List", None, _("_Bullet List"), - "asterisk", _("Bullet List"), - lambda w: self._on_bullet_list(), - "bullet.png") + - - map(lambda x: Action(*x), [ - + return ( + [Action(*x) for x in [ + ("Insert Horizontal Rule", None, _("Insert _Horizontal Rule"), "H", None, + lambda w: self._editor.on_insert_hr()), + ("Insert Image", None, _("Insert _Image..."), "", None, + lambda w: self._editor.on_insert_image()), + ("Insert New Image", None, _("Insert _New Image..."), "", _("Insert a new image"), + lambda w: self._on_new_image()), + ("Insert Screenshot", None, _("Insert _Screenshot..."), "Insert", None, + lambda w: self._editor.on_screenshot()), + ("Find In Page", "gtk-find", _("_Find In Page..."), "F", None, + lambda w: self._editor.find_dialog.on_find(False)), + ("Find Next In Page", "gtk-find", _("Find _Next In Page..."), "G", None, + lambda w: self._editor.find_dialog.on_find(False, forward=True)), + ("Find Previous In Page", "gtk-find", _("Find Pre_vious In Page..."), "G", None, + lambda w: self._editor.find_dialog.on_find(False, forward=False)), + ("Replace In Page", "gtk-find-and-replace", _("_Replace In Page..."), "R", None, + lambda w: self._editor.find_dialog.on_find(True)), + ("Format", None, _("Fo_rmat")) + ]] + + BothAction("Bold", "gtk-bold", _("_Bold"), "B", _("Bold"), + lambda w: self._on_mod("bold"), "bold.png") + + BothAction("Italic", "gtk-italic", _("_Italic"), "I", _("Italic"), + lambda w: self._on_mod("italic"), "italic.png") + + BothAction("Underline", "gtk-underline", _("_Underline"), "U", _("Underline"), + lambda w: self._on_mod("underline"), "underline.png") + + BothAction("Strike", None, _("S_trike"), "", _("Strike"), + lambda w: self._on_mod("strike"), "strike.png") + + BothAction("Monospace", None, _("_Monospace"), "M", _("Monospace"), + lambda w: self._on_mod("tt"), "fixed-width.png") + + BothAction("Link", None, _("Lin_k"), "L", _("Make Link"), + lambda w: self._on_toggle_link(), "link.png") + + BothAction("No Wrapping", None, _("No _Wrapping"), "", _("No Wrapping"), + lambda w: self._on_mod("nowrap"), "no-wrap.png") + + BothAction("Left Align", None, _("_Left Align"), "L", _("Left Align"), + lambda w: self._on_justify("left"), "alignleft.png") + + BothAction("Center Align", None, _("C_enter Align"), "E", _("Center Align"), + lambda w: self._on_justify("center"), "aligncenter.png") + + BothAction("Right Align", None, _("_Right Align"), "R", _("Right Align"), + lambda w: self._on_justify("right"), "alignright.png") + + BothAction("Justify Align", None, _("_Justify Align"), "J", _("Justify Align"), + lambda w: self._on_justify("fill"), "alignjustify.png") + + BothAction("Bullet List", None, _("_Bullet List"), "asterisk", _("Bullet List"), + lambda w: self._on_bullet_list(), "bullet.png") + + [Action(*x) for x in [ ("Font Selector Tool", None, "", "", _("Set Font Face")), ("Font Size Tool", None, "", "", _("Set Font Size")), ("Font Fg Color Tool", None, "", "", _("Set Text Color")), - ("Font Bg Color Tool", None, "", "", - _("Set Background Color")), - - ("Indent More", None, _("Indent M_ore"), - "parenright", None, - lambda w: self._on_indent(), - "indent-more.png"), - - ("Indent Less", None, _("Indent Le_ss"), - "parenleft", None, - lambda w: self._on_unindent(), - "indent-less.png"), - - ("Increase Font Size", None, _("Increase Font _Size"), - "equal", None, + ("Font Bg Color Tool", None, "", "", _("Set Background Color")), + ("Indent More", None, _("Indent M_ore"), "parenright", None, + lambda w: self._on_indent(), "indent-more.png"), + ("Indent Less", None, _("Indent Le_ss"), "parenleft", None, + lambda w: self._on_unindent(), "indent-less.png"), + ("Increase Font Size", None, _("Increase Font _Size"), "equal", None, lambda w: self._on_font_size_inc()), - - ("Decrease Font Size", None, _("_Decrease Font Size"), - "minus", None, + ("Decrease Font Size", None, _("_Decrease Font Size"), "minus", None, lambda w: self._on_font_size_dec()), - - ("Apply Text Color", None, _("_Apply Text Color"), - "", None, - lambda w: self._on_color_set("fg", self.fg_color_button), - "font-inc.png"), - - ("Apply Background Color", None, _("A_pply Background Color"), - "", None, - lambda w: self._on_color_set("bg", self.bg_color_button), - "font-dec.png"), - - ("Choose Font", None, _("Choose _Font"), - "F", None, - lambda w: self._on_choose_font(), - "font.png"), - - ("Go to Link", None, _("Go to Lin_k"), - "space", None, + ("Apply Text Color", None, _("_Apply Text Color"), "", None, + lambda w: self._on_color_set("fg", self.fg_color_button), "font-inc.png"), + ("Apply Background Color", None, _("A_pply Background Color"), "", None, + lambda w: self._on_color_set("bg", self.bg_color_button), "font-dec.png"), + ("Choose Font", None, _("Choose _Font"), "F", None, + lambda w: self._on_choose_font(), "font.png"), + ("Go to Link", None, _("Go to Lin_k"), "space", None, lambda w: self._editor.get_textview().click_iter()), - - ]) + - - [ToggleAction("Spell Check", None, _("_Spell Check"), - "", None, - self.on_spell_check_toggle)] + ]] + + [ToggleAction("Spell Check", None, _("_Spell Check"), "", None, self.on_spell_check_toggle)] ) def get_ui(self): + # Placeholder for GTK 4 GMenu or manual widget implementation + print("Warning: get_ui needs to be reimplemented for GTK 4") + return [] - use_minitoolbar = self._app.pref.get("look_and_feel", - "use_minitoolbar", - default=False) - - ui = [""" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - """] - - if use_minitoolbar: - ui.append(""" - - - - - - - - - - - - - - - - - - - - """) - else: - ui.append(""" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - """) - - return ui - - def setup_font_toggle(self, uimanager, path, stock=False, - update_func=lambda ui, font: None): - - action = uimanager.get_action(path) - # NOTE: action can be none if minimal toolbar is in use. - - if action: - proxies = action.get_proxies() - if len(proxies) == 0: - return None - # NOTE: sometimes get_proxies() is zero length after app options - # OK button is clicked. Don't know why this happens yet. - widget = action.get_proxies()[0] - - def block(): - action.handler_block(action.signal) - action.block_activate_from(widget) - - def unblock(): - action.handler_unblock(action.signal) - action.unblock_activate_from(widget) - - ui = FontUI(action, action.signal, update_func, - block=block, - unblock=unblock) - self._font_ui_signals.append(ui) - return ui - else: - return None + def setup_font_toggle(self, uimanager, path, stock=False, update_func=lambda ui, font: None): + print("Warning: setup_font_toggle needs to be reimplemented for GTK 4") + return None def setup_menu(self, window, uimanager): + print("Warning: setup_menu needs to be reimplemented for GTK 4") + pass - def update_toggle(ui, active): - if len(ui.widget.get_proxies()) > 0: - widget = ui.widget.get_proxies()[0] - widget.set_active(active) - - def replace_widget(path, widget): - w = uimanager.get_widget(path) - if w: - self._removed_widgets.append(w.child) - w.remove(w.child) - w.add(widget) - widget.show() - w.set_homogeneous(False) - - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Bold Tool", - update_func=lambda ui, font: update_toggle(ui, font.mods["bold"])) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Italic Tool", - update_func=lambda ui, font: - update_toggle(ui, font.mods["italic"])) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Underline Tool", - update_func=lambda ui, font: - update_toggle(ui, font.mods["underline"])) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Strike Tool", - update_func=lambda ui, font: - update_toggle(ui, font.mods["strike"])) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Monospace Tool", - update_func=lambda ui, font: update_toggle(ui, font.mods["tt"])) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Link Tool", - update_func=lambda ui, font: - update_toggle(ui, font.link is not None)) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/No Wrapping Tool", - update_func=lambda ui, font: - update_toggle(ui, font.mods["nowrap"])) - - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Left Align Tool", - update_func=lambda ui, font: - update_toggle(ui, font.justify == "left")) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Center Align Tool", - update_func=lambda ui, font: - update_toggle(ui, font.justify == "center")) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Right Align Tool", - update_func=lambda ui, font: - update_toggle(ui, font.justify == "right")) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Justify Align Tool", - update_func=lambda ui, font: - update_toggle(ui, font.justify == "fill")) - self.setup_font_toggle( - uimanager, "/main_tool_bar/Viewer/Editor/Bullet List Tool", - update_func=lambda ui, font: - update_toggle(ui, font.par_type == "bullet")) - - # family combo - font_family_combo = FontSelector() - font_family_combo.set_size_request(150, 25) - replace_widget("/main_tool_bar/Viewer/Editor/Font Selector Tool", - font_family_combo) - font_family_id = font_family_combo.connect("changed", - self._on_family_set) - self._font_ui_signals.append( - FontUI(font_family_combo, - font_family_id, - update_func=lambda ui, font: - ui.widget.set_family(font.family))) - - # font size - DEFAULT_FONT_SIZE = 10 - font_size_button = gtk.SpinButton( - gtk.Adjustment(value=DEFAULT_FONT_SIZE, lower=2, upper=500, - step_incr=1)) - font_size_button.set_size_request(-1, 25) - font_size_button.set_value(DEFAULT_FONT_SIZE) - font_size_button.set_editable(False) - replace_widget("/main_tool_bar/Viewer/Editor/Font Size Tool", - font_size_button) - - font_size_id = font_size_button.connect( - "value-changed", - lambda w: - self._on_font_size_change(font_size_button.get_value())) - self._font_ui_signals.append( - FontUI(font_size_button, - font_size_id, - update_func=lambda ui, font: - ui.widget.set_value(font.size))) - - def on_new_colors(notebook, colors): - if self._editor.get_notebook() == notebook: - self.fg_color_button.set_colors(colors) - self.bg_color_button.set_colors(colors) - self._app.get_listeners("colors_changed").add(on_new_colors) - - # init colors - notebook = self._editor.get_notebook() - if notebook: - colors = notebook.pref.get("colors", default=DEFAULT_COLORS) - else: - colors = DEFAULT_COLORS - - # font fg color - # TODO: code in proper default color - self.fg_color_button = FgColorTool(14, 15, "#000000") - self.fg_color_button.set_colors(colors) - self.fg_color_button.set_homogeneous(False) - self.fg_color_button.connect( - "set-color", - lambda w, color: self._on_color_set( - "fg", self.fg_color_button, color)) - self.fg_color_button.connect( - "set-colors", - lambda w, colors: self._on_colors_set(colors)) - replace_widget("/main_tool_bar/Viewer/Editor/Font Fg Color Tool", - self.fg_color_button) - - # font bg color - self.bg_color_button = BgColorTool(14, 15, "#ffffff") - self.bg_color_button.set_colors(colors) - self.bg_color_button.set_homogeneous(False) - self.bg_color_button.connect( - "set-color", - lambda w, color: self._on_color_set( - "bg", self.bg_color_button, color)) - self.bg_color_button.connect( - "set-colors", - lambda w, colors: self._on_colors_set(colors)) - replace_widget("/main_tool_bar/Viewer/Editor/Font Bg Color Tool", - self.bg_color_button) - - # get spell check toggle - self.spell_check_toggle = \ - uimanager.get_widget("/main_menu_bar/Tools/Viewer/Spell Check") - self.spell_check_toggle.set_sensitive( - self._editor.get_textview().can_spell_check()) - self.spell_check_toggle.set_active(window.get_app().pref.get( - "editors", "general", "spell_check", default=True)) - - -class ComboToolItem(gtk.ToolItem): - - __gtype_name__ = "ComboToolItem" - +class ComboToolItem(Gtk.Box): def __init__(self): - gtk.ToolItem.__init__(self) - - self.set_border_width(2) - self.set_homogeneous(False) - self.set_expand(False) + super().__init__(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) + self.set_margin_top(3) + self.set_margin_bottom(3) + self.set_margin_start(6) + self.set_margin_end(6) - self.combobox = gtk.combo_box_entry_new_text() + self.combobox = Gtk.ComboBoxText.new_with_entry() for text in ['a', 'b', 'c', 'd', 'e', 'f']: self.combobox.append_text(text) - self.combobox.show() - self.add(self.combobox) - - def do_set_tooltip(self, tooltips, tip_text=None, tip_private=None): - gtk.ToolItem.set_tooltip(self, tooltips, tip_text, tip_private) - - tooltips.set_tip(self.combobox, tip_text, tip_private) + self.append(self.combobox) + def set_tooltip(self, tooltips, tip_text=None, tip_private=None): + self.set_tooltip_text(tip_text) + self.combobox.set_tooltip_text(tip_text) -class ComboToolAction(gtk.Action): - - __gtype_name__ = "ComboToolAction" - +class ComboToolAction(Action): def __init__(self, name, label, tooltip, stock_id): - gtk.Action.__init__(self, name, label, tooltip, stock_id) - + super().__init__(name=name, label=label, tooltip=tooltip, stock_id=stock_id) -ComboToolAction.set_tool_item_type(ComboToolItem) + def create_tool_item(self): + return ComboToolItem() \ No newline at end of file diff --git a/keepnote/gui/editor_sourceview.py b/keepnote/gui/editor_sourceview.py index e5f50ede8..1825ab61b 100644 --- a/keepnote/gui/editor_sourceview.py +++ b/keepnote/gui/editor_sourceview.py @@ -1,140 +1,85 @@ -""" - - KeepNote - Editor widget in main window - -""" - - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade -import gobject +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk +# Try to import gtksourceview5 (for GTK 4) try: - raise ImportError() - - from gtksourceview2 import View as SourceView - from gtksourceview2 import Buffer as SourceBuffer - from gtksourceview2 import LanguageManager as SourceLanguageManager + gi.require_version('GtkSource', '5') # Use version 5 for GTK 4 compatibility + from gi.repository import GtkSource + SourceView = GtkSource.View + SourceBuffer = GtkSource.Buffer + SourceLanguageManager = GtkSource.LanguageManager except ImportError: SourceView = None + SourceBuffer = None + SourceLanguageManager = None -# keepnote imports +# KeepNote imports import keepnote -from keepnote import \ - KeepNoteError, unicode_gtk -from keepnote.notebook import \ - NoteBookError, \ - parse_node_url, \ - is_node_url -from keepnote.gui.richtext import \ - RichTextView, RichTextBuffer, \ - RichTextIO, RichTextError -from keepnote.gui import \ - CONTEXT_MENU_ACCEL_PATH, \ - Action, \ - ToggleAction, \ - add_actions +from keepnote import KeepNoteError, unicode_gtk +from keepnote.notebook import NoteBookError, parse_node_url, is_node_url +from keepnote.gui.richtext import RichTextView, RichTextBuffer, RichTextIO, RichTextError +from keepnote.gui import CONTEXT_MENU_ACCEL_PATH, Action, ToggleAction, add_actions from keepnote.gui.editor import KeepNoteEditor _ = keepnote.translate - -class TextEditor (KeepNoteEditor): +class TextEditor(KeepNoteEditor): + """Text editor for KeepNote, supporting plain text and source code""" def __init__(self, app): - KeepNoteEditor.__init__(self, app) + super().__init__(app) self._app = app self._notebook = None self._link_picker = None - self._maxlinks = 10 # maximum number of links to show in link picker + self._maxlinks = 10 # Maximum number of links to show in link picker - # state - self._page = None # current NoteBookPage - self._page_scrolls = {} # remember scroll in each page + # State + self._page = None + self._page_scrolls = {} self._page_cursors = {} self._textview_io = RichTextIO() - # textview and its callbacks + # Textview and its callbacks if SourceView: - self._textview = SourceView(SourceBuffer()) + self._textview = SourceView.new_with_buffer(SourceBuffer()) self._textview.get_buffer().set_highlight_syntax(True) - #self._textview.set_show_margin(True) - #self._textview.disable() else: - self._textview = RichTextView(RichTextBuffer( - self._app.get_richtext_tag_table())) # textview + self._textview = RichTextView(RichTextBuffer(self._app.get_richtext_tag_table())) self._textview.disable() self._textview.connect("modified", self._on_modified_callback) self._textview.connect("visit-url", self._on_visit_url) - # scrollbars - self._sw = gtk.ScrolledWindow() - self._sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self._sw.set_shadow_type(gtk.SHADOW_IN) - self._sw.add(self._textview) - self.pack_start(self._sw) - - #self._socket = gtk.Socket() - #self.pack_start(self._socket) + # Scrollbars + self._sw = Gtk.ScrolledWindow() + self._sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + self._sw.set_has_frame(True) # Replaces set_shadow_type + self._sw.set_child(self._textview) # Changed from add to set_child + if self._sw.get_parent() is None: # 防止重复挂载 + self.append(self._sw) - # menus - #self.editor_menus = EditorMenus(self._app, self) + # Changed from pack_start to append - # find dialog - #self.find_dialog = dialog_find.KeepNoteFindDialog(self) - - self.show_all() + # Menus and find dialog are commented out in the original code + # self.editor_menus = EditorMenus(self._app, self) + # self.find_dialog = dialog_find.KeepNoteFindDialog(self) def set_notebook(self, notebook): """Set notebook for editor""" - # set new notebook self._notebook = notebook - - if self._notebook: - # read default font - pass - else: - # no new notebook, clear the view + if not self._notebook: self.clear_view() def load_preferences(self, app_pref, first_open=False): """Load application preferences""" - - #self.editor_menus.enable_spell_check( - # self._app.pref.get("editors", "general", "spell_check", - # default=True)) - if not SourceView: self._textview.set_default_font("Monospace 10") def save_preferences(self, app_pref): """Save application preferences""" - # record state in preferences - #app_pref.set("editors", "general", "spell_check", - # self._textview.is_spell_check_enabled()) + pass def get_textview(self): """Return the textview""" @@ -142,7 +87,7 @@ def get_textview(self): def is_focus(self): """Return True if text editor has focus""" - return self._textview.is_focus() + return self._textview.has_focus() def grab_focus(self): """Pass focus to textview""" @@ -164,18 +109,14 @@ def redo(self): def view_nodes(self, nodes): """View a page in the editor""" - # editor cannot view multiple nodes at once - # if asked to, it will view none if len(nodes) > 1: nodes = [] - # save current page before changing nodes self.save() self._save_cursor() - if len(nodes) == 0: + if not nodes: self.clear_view() - else: page = nodes[0] self._page = page @@ -184,99 +125,70 @@ def view_nodes(self, nodes): try: if page.has_attr("payload_filename"): - #text = safefile.open( - # os.path.join(page.get_path(), - # page.get_attr("payload_filename")), - # codec="utf-8").read() - infile = page.open_file( - page.get_attr("payload_filename"), "r", "utf-8") + infile = page.open_file(page.get_attr("payload_filename"), "r", "utf-8") text = infile.read() infile.close() self._textview.get_buffer().set_text(text) self._load_cursor() if SourceView: - manager = SourceLanguageManager() - #print manager.get_language_ids() - #lang = manager.get_language_from_mime_type( - # page.get_attr("content_type")) + manager = SourceLanguageManager.get_default() lang = manager.get_language("python") - self._textview.get_buffer().set_language(lang) + if lang: + self._textview.get_buffer().set_language(lang) else: self.clear_view() - except RichTextError, e: + except RichTextError as e: self.clear_view() self.emit("error", e.msg, e) - except Exception, e: + except Exception as e: self.clear_view() self.emit("error", "Unknown error", e) - if len(nodes) > 0: + if nodes: self.emit("view-node", nodes[0]) def _save_cursor(self): if self._page is not None: - it = self._textview.get_buffer().get_iter_at_mark( - self._textview.get_buffer().get_insert()) + it = self._textview.get_buffer().get_iter_at_mark(self._textview.get_buffer().get_insert()) self._page_cursors[self._page] = it.get_offset() - x, y = self._textview.window_to_buffer_coords( - gtk.TEXT_WINDOW_TEXT, 0, 0) + x, y = self._textview.window_to_buffer_coords(Gtk.TextWindowType.TEXT, 0, 0) it = self._textview.get_iter_at_location(x, y) self._page_scrolls[self._page] = it.get_offset() def _load_cursor(self): - - # place cursor in last location if self._page in self._page_cursors: offset = self._page_cursors[self._page] it = self._textview.get_buffer().get_iter_at_offset(offset) self._textview.get_buffer().place_cursor(it) - # place scroll in last position if self._page in self._page_scrolls: offset = self._page_scrolls[self._page] buf = self._textview.get_buffer() it = buf.get_iter_at_offset(offset) mark = buf.create_mark(None, it, True) - self._textview.scroll_to_mark( - mark, 0.49, use_align=True, xalign=0.0) + self._textview.scroll_to_mark(mark, 0.49, True, 0.0, 0.0) buf.delete_mark(mark) def save(self): """Save the loaded page""" if (self._page is not None and - self._page.is_valid() and - (SourceView or - self._textview.is_modified())): - + self._page.is_valid() and + (SourceView or self._textview.is_modified())): try: - # save text data buf = self._textview.get_buffer() - text = unicode_gtk(buf.get_text(buf.get_start_iter(), - buf.get_end_iter())) - #out = safefile.open( - # os.path.join(self._page.get_path(), - # self._page.get_attr("payload_filename")), "w", - # codec="utf-8") - out = self._page.open_file( - self._page.get_attr("payload_filename"), "w", "utf-8") + text = unicode_gtk(buf.get_text(buf.get_start_iter(), buf.get_end_iter(), False)) + out = self._page.open_file(self._page.get_attr("payload_filename"), "w", "utf-8") out.write(text) out.close() - # save meta data self._page.set_attr_timestamp("modified_time") self._page.save() - except RichTextError, e: - self.emit("error", e.msg, e) - - except NoteBookError, e: - self.emit("error", e.msg, e) - - except Exception, e: + except (RichTextError, NoteBookError, Exception) as e: self.emit("error", str(e), e) def save_needed(self): @@ -290,142 +202,81 @@ def add_ui(self, window): self._textview.set_accel_group(window.get_accel_group()) self._textview.set_accel_path(CONTEXT_MENU_ACCEL_PATH) - #if hasattr(self, "_socket"): - # print "id", self._socket.get_id() - # self._socket.add_id(0x480001f) - - #self.editor_menus.add_ui(window, - # use_minitoolbar= - # self._app.pref.get("look_and_feel", - # "use_minitoolbar", - # default=False)) - def remove_ui(self, window): pass - #self.editor_menus.remove_ui(window) - - #=========================================== - # callbacks for textview + # Callbacks for textview def _on_modified_callback(self, textview, modified): - """Callback for textview modification""" self.emit("modified", self._page, modified) - - # make notebook node modified if modified: self._page.mark_modified() self._page.notify_change(False) def _on_visit_url(self, textview, url): - """Callback for textview visiting a URL""" - if is_node_url(url): host, nodeid = parse_node_url(url) node = self._notebook.get_node_by_id(nodeid) if node: self.emit("visit-node", node) - else: try: self._app.open_webpage(url) - except KeepNoteError, e: + except KeepNoteError as e: self.emit("error", e.msg, e) - -class EditorMenus (gobject.GObject): +class EditorMenus: + """Menus for the TextEditor""" def __init__(self, app, editor): - gobject.GObject.__init__(self) - self._app = app self._editor = editor self._action_group = None self._uis = [] self.spell_check_toggle = None - self._removed_widgets = [] - #======================================================= - # spellcheck - + # Spellcheck def enable_spell_check(self, enabled): - """Spell check""" self._editor.get_textview().enable_spell_check(enabled) - - # see if spell check became enabled enabled = self._editor.get_textview().is_spell_check_enabled() - - # update UI to match if self.spell_check_toggle: self.spell_check_toggle.set_active(enabled) - return enabled def on_spell_check_toggle(self, widget): - """Toggle spell checker""" self.enable_spell_check(widget.get_active()) - #===================================================== - # toolbar and menus - + # Toolbar and menus def add_ui(self, window): - self._action_group = gtk.ActionGroup("Editor") - self._uis = [] - add_actions(self._action_group, self.get_actions()) - window.get_uimanager().insert_action_group( - self._action_group, 0) - - for s in self.get_ui(): - self._uis.append(window.get_uimanager().add_ui_from_string(s)) - window.get_uimanager().ensure_update() - - self.setup_menu(window, window.get_uimanager()) + # Note: Gtk.UIManager is deprecated in GTK 4. This method needs to be reimplemented + # using a different approach, such as GMenu or manual widget creation. + # print("Warning: add_ui needs to be reimplemented for GTK 4 (Gtk.UIManager is deprecated)") + pass def remove_ui(self, window): - # remove ui - for ui in reversed(self._uis): - window.get_uimanager().remove_ui(ui) - self._uis = [] - window.get_uimanager().ensure_update() - - # remove action group - window.get_uimanager().remove_action_group(self._action_group) - self._action_group = None + # Similarly, this method needs to be reimplemented for GTK 4. + # print("Warning: remove_ui needs to be reimplemented for GTK 4 (Gtk.UIManager is deprecated)") + pass def get_actions(self): - def BothAction(name1, *args): return [Action(name1, *args), ToggleAction(name1 + " Tool", *args)] - return (map(lambda x: Action(*x), [ - # finding - ("Find In Page", gtk.STOCK_FIND, _("_Find In Page..."), - "F", None, - lambda w: self._editor.find_dialog.on_find(False)), - - ("Find Next In Page", gtk.STOCK_FIND, _("Find _Next In Page..."), - "G", None, - lambda w: self._editor.find_dialog.on_find(False, forward=True)), - - ("Find Previous In Page", gtk.STOCK_FIND, - _("Find Pre_vious In Page..."), - "G", None, - lambda w: self._editor.find_dialog.on_find(False, forward=False)), - - ("Replace In Page", gtk.STOCK_FIND_AND_REPLACE, - _("_Replace In Page..."), - "R", None, - lambda w: self._editor.find_dialog.on_find(True)), - - ]) + - - [ToggleAction("Spell Check", None, _("_Spell Check"), - "", None, - self.on_spell_check_toggle)] + return ( + [Action(*x) for x in [ + ("Find In Page", "gtk-find", _("_Find In Page..."), "F", None, + lambda w: self._editor.find_dialog.on_find(False)), + ("Find Next In Page", "gtk-find", _("Find _Next In Page..."), "G", None, + lambda w: self._editor.find_dialog.on_find(False, forward=True)), + ("Find Previous In Page", "gtk-find", _("Find Pre_vious In Page..."), "G", None, + lambda w: self._editor.find_dialog.on_find(False, forward=False)), + ("Replace In Page", "gtk-find-and-replace", _("_Replace In Page..."), "R", None, + lambda w: self._editor.find_dialog.on_find(True)), + ]] + + [ToggleAction("Spell Check", None, _("_Spell Check"), "", None, self.on_spell_check_toggle)] ) def get_ui(self): - ui = [""" @@ -450,21 +301,19 @@ def get_ui(self): - - - + """] ui.append(""" @@ -475,17 +324,12 @@ def get_ui(self): - """) return ui def setup_menu(self, window, uimanager): - # get spell check toggle - self.spell_check_toggle = ( - uimanager.get_widget("/main_menu_bar/Tools/Viewer/Spell Check")) - self.spell_check_toggle.set_sensitive( - self._editor.get_textview().can_spell_check()) - self.spell_check_toggle.set_active(window.get_app().pref.get( - "editors", "general", "spell_check", default=True)) + # Note: This method needs to be reimplemented for GTK 4 due to the removal of Gtk.UIManager + print("Warning: setup_menu needs to be reimplemented for GTK 4") + pass \ No newline at end of file diff --git a/keepnote/gui/editor_text.py b/keepnote/gui/editor_text.py index 9a762680d..c017f8de9 100644 --- a/keepnote/gui/editor_text.py +++ b/keepnote/gui/editor_text.py @@ -1,119 +1,67 @@ -""" - - KeepNote - Editor widget in main window - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade -import gobject - -# keepnote imports +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk + +# KeepNote imports import keepnote -from keepnote import \ - KeepNoteError, unicode_gtk -from keepnote.notebook import \ - NoteBookError, \ - parse_node_url, \ - is_node_url -from keepnote.gui.richtext import \ - RichTextView, RichTextBuffer, \ - RichTextIO, RichTextError -from keepnote.gui import \ - CONTEXT_MENU_ACCEL_PATH, \ - Action, \ - ToggleAction, \ - add_actions, \ - dialog_find +from keepnote import KeepNoteError +from keepnote.util.platform import unicode_gtk +from keepnote.notebook import NoteBookError, parse_node_url, is_node_url +from keepnote.gui.richtext import RichTextView, RichTextBuffer, RichTextIO, RichTextError +from keepnote.gui import CONTEXT_MENU_ACCEL_PATH, Action, ToggleAction, add_actions +from keepnote.gui import dialog_find from keepnote.gui.editor import KeepNoteEditor - _ = keepnote.translate - -class TextEditor (KeepNoteEditor): +class TextEditor(KeepNoteEditor): + """Text editor for KeepNote, supporting plain text""" def __init__(self, app): - KeepNoteEditor.__init__(self, app) + super().__init__(app) self._app = app self._notebook = None - # state - self._page = None # current NoteBookPage - self._page_scrolls = {} # remember scroll in each page + # State + self._page = None + self._page_scrolls = {} self._page_cursors = {} self._textview_io = RichTextIO() - # textview and its callbacks - self._textview = RichTextView(RichTextBuffer( - self._app.get_richtext_tag_table())) # textview + # Textview and its callbacks + self._textview = RichTextView(RichTextBuffer(self._app.get_richtext_tag_table())) self._textview.disable() self._textview.connect("modified", self._on_modified_callback) self._textview.connect("visit-url", self._on_visit_url) - # scrollbars - self._sw = gtk.ScrolledWindow() - self._sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self._sw.set_shadow_type(gtk.SHADOW_IN) - self._sw.add(self._textview) - self.pack_start(self._sw) - - #self._socket = gtk.Socket() - #self.pack_start(self._socket) + # Scrollbars + self._sw = Gtk.ScrolledWindow() + self._sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + self._sw.set_has_frame(True) # Replaces set_shadow_type + self._sw.set_child(self._textview) # Changed from add to set_child + self.append(self._sw) # Changed from pack_start to append - # menus + # Menus self.editor_menus = EditorMenus(self._app, self) - # find dialog + # Find dialog self.find_dialog = dialog_find.KeepNoteFindDialog(self) - self.show_all() - def set_notebook(self, notebook): """Set notebook for editor""" - # set new notebook self._notebook = notebook - - if self._notebook: - # read default font - pass - else: - # no new notebook, clear the view + if not self._notebook: self.clear_view() def load_preferences(self, app_pref, first_open=False): """Load application preferences""" self.editor_menus.enable_spell_check( - self._app.pref.get("editors", "general", "spell_check", - default=True)) - + self._app.pref.get("editors", "general", "spell_check", default=True)) self._textview.set_default_font("Monospace 10") def save_preferences(self, app_pref): """Save application preferences""" - # record state in preferences app_pref.set("editors", "general", "spell_check", self._textview.is_spell_check_enabled()) @@ -123,7 +71,7 @@ def get_textview(self): def is_focus(self): """Return True if text editor has focus""" - return self._textview.is_focus() + return self._textview.has_focus() def grab_focus(self): """Pass focus to textview""" @@ -144,19 +92,14 @@ def redo(self): def view_nodes(self, nodes): """View a node(s) in the editor""" - - # editor cannot view multiple nodes at once - # if asked to, it will view none if len(nodes) > 1: nodes = [] - # save current page before changing nodes self.save() self._save_cursor() - if len(nodes) == 0: + if not nodes: self.clear_view() - else: page = nodes[0] self._page = page @@ -164,90 +107,69 @@ def view_nodes(self, nodes): try: if page.has_attr("payload_filename"): - infile = page.open_file( - page.get_attr("payload_filename"), "r", "utf-8") + infile = page.open_file(page.get_attr("payload_filename"), "r", "utf-8") text = infile.read() infile.close() self._textview.get_buffer().set_text(text) self._load_cursor() - else: self.clear_view() - except UnicodeDecodeError, e: + except UnicodeDecodeError as e: self.clear_view() - except RichTextError, e: + except RichTextError as e: self.clear_view() self.emit("error", e.msg, e) - except Exception, e: + except Exception as e: keepnote.log_error() self.clear_view() self.emit("error", "Unknown error", e) - if len(nodes) > 0: + if nodes: self.emit("view-node", nodes[0]) def _save_cursor(self): if self._page is not None: - it = self._textview.get_buffer().get_iter_at_mark( - self._textview.get_buffer().get_insert()) + it = self._textview.get_buffer().get_iter_at_mark(self._textview.get_buffer().get_insert()) self._page_cursors[self._page] = it.get_offset() - x, y = self._textview.window_to_buffer_coords( - gtk.TEXT_WINDOW_TEXT, 0, 0) + x, y = self._textview.window_to_buffer_coords(Gtk.TextWindowType.TEXT, 0, 0) it = self._textview.get_iter_at_location(x, y) self._page_scrolls[self._page] = it.get_offset() def _load_cursor(self): - # place cursor in last location if self._page in self._page_cursors: offset = self._page_cursors[self._page] it = self._textview.get_buffer().get_iter_at_offset(offset) self._textview.get_buffer().place_cursor(it) - # place scroll in last position if self._page in self._page_scrolls: offset = self._page_scrolls[self._page] buf = self._textview.get_buffer() it = buf.get_iter_at_offset(offset) mark = buf.create_mark(None, it, True) - self._textview.scroll_to_mark( - mark, 0.49, use_align=True, xalign=0.0) + self._textview.scroll_to_mark(mark, 0.49, True, 0.0, 0.0) buf.delete_mark(mark) def save(self): """Save the loaded page""" - if self._page is not None and \ - self._page.is_valid() and \ - self._textview.is_modified(): - + if self._page is not None and self._page.is_valid() and self._textview.is_modified(): try: - # save text data buf = self._textview.get_buffer() - text = unicode_gtk(buf.get_text(buf.get_start_iter(), - buf.get_end_iter())) - out = self._page.open_file( - self._page.get_attr("payload_filename"), "w", "utf-8") + text = unicode_gtk(buf.get_text(buf.get_start_iter(), buf.get_end_iter(), False)) + out = self._page.open_file(self._page.get_attr("payload_filename"), "w", "utf-8") out.write(text) out.close() - # save meta data self._page.set_attr_timestamp("modified_time") self._page.save() - except RichTextError, e: - self.emit("error", e.msg, e) - - except NoteBookError, e: - self.emit("error", e.msg, e) - - except Exception, e: + except (RichTextError, NoteBookError, Exception) as e: self.emit("error", str(e), e) def save_needed(self): """Returns True if textview is modified""" return self._textview.is_modified() - return False def add_ui(self, window): self._textview.set_accel_group(window.get_accel_group()) @@ -257,127 +179,78 @@ def add_ui(self, window): def remove_ui(self, window): self.editor_menus.remove_ui(window) - #=========================================== - # callbacks for textview - + # Callbacks for textview def _on_modified_callback(self, textview, modified): - """Callback for textview modification""" self.emit("modified", self._page, modified) - - # make notebook node modified if modified: self._page.mark_modified() self._page.notify_change(False) def _on_visit_url(self, textview, url): - """Callback for textview visiting a URL""" if is_node_url(url): host, nodeid = parse_node_url(url) node = self._notebook.get_node_by_id(nodeid) if node: self.emit("visit-node", node) - else: try: self._app.open_webpage(url) - except KeepNoteError, e: + except KeepNoteError as e: self.emit("error", e.msg, e) - -class EditorMenus (gobject.GObject): +class EditorMenus: + """Menus for the TextEditor""" def __init__(self, app, editor): - gobject.GObject.__init__(self) - self._app = app self._editor = editor self._action_group = None self._uis = [] self.spell_check_toggle = None - self._removed_widgets = [] - #======================================================= - # spellcheck - + # Spellcheck def enable_spell_check(self, enabled): - """Spell check""" self._editor.get_textview().enable_spell_check(enabled) - - # see if spell check became enabled enabled = self._editor.get_textview().is_spell_check_enabled() - - # update UI to match if self.spell_check_toggle: self.spell_check_toggle.set_active(enabled) - return enabled def on_spell_check_toggle(self, widget): - """Toggle spell checker""" self.enable_spell_check(widget.get_active()) - #===================================================== - # toolbar and menus - + # Toolbar and menus def add_ui(self, window): - self._action_group = gtk.ActionGroup("Editor") - self._uis = [] - add_actions(self._action_group, self.get_actions()) - window.get_uimanager().insert_action_group( - self._action_group, 0) - - for s in self.get_ui(): - self._uis.append(window.get_uimanager().add_ui_from_string(s)) - window.get_uimanager().ensure_update() - - self.setup_menu(window, window.get_uimanager()) + # Note: Gtk.UIManager is deprecated in GTK 4. This method needs to be reimplemented + # using a different approach, such as GMenu or manual widget creation. + print("Warning: add_ui needs to be reimplemented for GTK 4 (Gtk.UIManager is deprecated)") + pass def remove_ui(self, window): - # remove ui - for ui in reversed(self._uis): - window.get_uimanager().remove_ui(ui) - self._uis = [] - window.get_uimanager().ensure_update() - - # remove action group - window.get_uimanager().remove_action_group(self._action_group) - self._action_group = None + # Similarly, this method needs to be reimplemented for GTK 4. + print("Warning: remove_ui needs to be reimplemented for GTK 4 (Gtk.UIManager is deprecated)") + pass def get_actions(self): - def BothAction(name1, *args): return [Action(name1, *args), ToggleAction(name1 + " Tool", *args)] - return (map(lambda x: Action(*x), [ - # finding - ("Find In Page", gtk.STOCK_FIND, _("_Find In Page..."), - "F", None, - lambda w: self._editor.find_dialog.on_find(False)), - - ("Find Next In Page", gtk.STOCK_FIND, _("Find _Next In Page..."), - "G", None, - lambda w: self._editor.find_dialog.on_find(False, forward=True)), - - ("Find Previous In Page", gtk.STOCK_FIND, - _("Find Pre_vious In Page..."), - "G", None, - lambda w: self._editor.find_dialog.on_find(False, forward=False)), - - ("Replace In Page", gtk.STOCK_FIND_AND_REPLACE, - _("_Replace In Page..."), - "R", None, - lambda w: self._editor.find_dialog.on_find(True)), - - ]) + - - [ToggleAction("Spell Check", None, _("_Spell Check"), - "", None, - self.on_spell_check_toggle)] + return ( + [Action(*x) for x in [ + ("Find In Page", "gtk-find", _("_Find In Page..."), "F", None, + lambda w: self._editor.find_dialog.on_find(False)), + ("Find Next In Page", "gtk-find", _("Find _Next In Page..."), "G", None, + lambda w: self._editor.find_dialog.on_find(False, forward=True)), + ("Find Previous In Page", "gtk-find", _("Find Pre_vious In Page..."), "G", None, + lambda w: self._editor.find_dialog.on_find(False, forward=False)), + ("Replace In Page", "gtk-find-and-replace", _("_Replace In Page..."), "R", None, + lambda w: self._editor.find_dialog.on_find(True)), + ]] + + [ToggleAction("Spell Check", None, _("_Spell Check"), "", None, self.on_spell_check_toggle)] ) def get_ui(self): - ui = [""" @@ -402,21 +275,19 @@ def get_ui(self): - - - + """] ui.append(""" @@ -427,17 +298,16 @@ def get_ui(self): - """) return ui def setup_menu(self, window, uimanager): - # get spell check toggle - self.spell_check_toggle = \ - uimanager.get_widget("/main_menu_bar/Tools/Viewer/Spell Check") - self.spell_check_toggle.set_sensitive( - self._editor.get_textview().can_spell_check()) + self.spell_check_toggle = uimanager.get_widget("/main_menu_bar/Tools/Viewer/Spell Check") + self.spell_check_toggle.set_sensitive(self._editor.get_textview().can_spell_check()) self.spell_check_toggle.set_active(window.get_app().pref.get( "editors", "general", "spell_check", default=True)) + # Note: This method needs to be reimplemented for GTK 4 due to the removal of Gtk.UIManager + print("Warning: setup_menu needs to be reimplemented for GTK 4") + # pass \ No newline at end of file diff --git a/keepnote/gui/extension.py b/keepnote/gui/extension.py index 2b6634168..60423bb99 100644 --- a/keepnote/gui/extension.py +++ b/keepnote/gui/extension.py @@ -1,47 +1,18 @@ -""" - KeepNote - Extension system with GUI relevant functions -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python 3 and PyGObject imports import sys +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk -# gtk imports -import gtk - -# keepnote imports +# KeepNote imports import keepnote from keepnote import extension - -#============================================================================= -# extension functions - - -class Extension (extension.Extension): - """KeepNote Extension""" +class Extension(extension.Extension): + """KeepNote Extension with GUI support""" def __init__(self, app): - extension.Extension.__init__(self, app) + super().__init__(app) self.__windows = set() self.__uis = set() @@ -53,18 +24,17 @@ def __init__(self, app): self.enabled.add(self._on_enable_ui) #================================ - # window interactions + # Window interactions def _on_enable_ui(self, enabled): """Initialize UI during enable/disable""" if enabled: - # TODO: should each extension have to remember what windows it has? for window in self.__windows: if window not in self.__uis: self.on_add_ui(window) self.__uis.add(window) else: - for window in self.__uis: + for window in list(self.__uis): self.on_remove_ui(window) self.__uis.clear() @@ -74,7 +44,7 @@ def on_new_window(self, window): try: self.on_add_ui(window) self.__uis.add(window) - except Exception, e: + except Exception as e: keepnote.log_error(e, sys.exc_info()[2]) self.__windows.add(window) @@ -84,7 +54,7 @@ def on_close_window(self, window): if window in self.__uis: try: self.on_remove_ui(window) - except Exception, e: + except Exception as e: keepnote.log_error(e, sys.exc_info()[2]) self.__uis.remove(window) self.__windows.remove(window) @@ -97,76 +67,67 @@ def get_windows(self): # UI interaction def on_add_ui(self, window): + """Callback to add UI elements for a window""" pass def on_remove_ui(self, window): - # remove actions for window + """Callback to remove UI elements for a window""" self.remove_all_actions(window) - - # remove ui elements for window self.remove_all_ui(window) def on_add_options_ui(self, dialog): + """Callback to add options UI to a dialog""" pass def on_remove_options_ui(self, dialog): + """Callback to remove options UI from a dialog""" pass #=============================== - # helper functions + # Helper functions def add_action(self, window, action_name, menu_text, callback=lambda w: None, stock_id=None, accel="", tooltip=None): - # init action group - if window not in self.__action_groups: - group = gtk.ActionGroup("MainWindow") - self.__action_groups[window] = group - window.get_uimanager().insert_action_group(group, 0) - - # add action - self.__action_groups[window].add_actions([ - (action_name, stock_id, menu_text, accel, tooltip, callback)]) + """Add an action to the window's UI manager""" + # Note: Gtk.ActionGroup is deprecated in GTK 4. This method needs to be reimplemented + # using GAction and GMenu or manual widget creation. + print(f"Warning: add_action needs to be reimplemented for GTK 4 (Gtk.ActionGroup is deprecated) - {action_name}") + pass def remove_action(self, window, action_name): - group = self.__action_groups.get(window, None) - if group is not None: - action = group.get_action(action_name) - if action: - group.remove_action(action) + """Remove a specific action from the window's UI manager""" + # Note: This method needs to be reimplemented for GTK 4. + print(f"Warning: remove_action needs to be reimplemented for GTK 4 - {action_name}") + pass def remove_all_actions(self, window): - group = self.__action_groups.get(window, None) - if group is not None: - window.get_uimanager().remove_action_group(group) + """Remove all actions for the window""" + # Note: This method needs to be reimplemented for GTK 4. + print("Warning: remove_all_actions needs to be reimplemented for GTK 4") + if window in self.__action_groups: del self.__action_groups[window] def add_ui(self, window, uixml): - # init list of ui ids - uids = self.__ui_ids.get(window, None) - if uids is None: - uids = self.__ui_ids[window] = [] - - # add ui, record id - uid = window.get_uimanager().add_ui_from_string(uixml) - uids.append(uid) - - # return id - return uid + """Add UI elements to the window's UI manager""" + # Note: Gtk.UIManager is deprecated in GTK 4. This method needs to be reimplemented + # using GMenu or manual widget creation. + print("Warning: add_ui needs to be reimplemented for GTK 4 (Gtk.UIManager is deprecated)") + return None def remove_ui(self, window, uid): - uids = self.__ui_ids.get(window, None) + """Remove a specific UI element from the window's UI manager""" + # Note: This method needs to be reimplemented for GTK 4. + print("Warning: remove_ui needs to be reimplemented for GTK 4") + uids = self.__ui_ids.get(window) if uids is not None and uid in uids: - window.get_uimanager().remove_ui(uid) uids.remove(uid) - - # remove uid list if last uid removed if len(uids) == 0: del self.__ui_ids[window] def remove_all_ui(self, window): - uids = self.__ui_ids.get(window, None) - if uids is not None: - for uid in uids: - window.get_uimanager().remove_ui(uid) - del self.__ui_ids[window] + """Remove all UI elements for the window""" + # Note: This method needs to be reimplemented for GTK 4. + print("Warning: remove_all_ui needs to be reimplemented for GTK 4") + if window in self.__ui_ids: + del self.__ui_ids[window] \ No newline at end of file diff --git a/keepnote/gui/font_selector.py b/keepnote/gui/font_selector.py index 9ec173891..c005289ba 100644 --- a/keepnote/gui/font_selector.py +++ b/keepnote/gui/font_selector.py @@ -1,65 +1,54 @@ -""" +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, Pango - KeepNote - Font selector widget - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk.glade - - -class FontSelector (gtk.ComboBox): - """ComboBox for selection Font family""" +class FontSelector(Gtk.ComboBox): + """ComboBox for selecting font families""" def __init__(self): - gtk.ComboBox.__init__(self) - - self._list = gtk.ListStore(str) + super().__init__() + # Create a ListStore to hold font family names (strings) + self._list = Gtk.ListStore.new([str]) self.set_model(self._list) - self._families = sorted( - f.get_name() - for f in self.get_pango_context().list_families()) + # Get the list of font families from Pango context + context = self.get_pango_context_fixed() + self._families = sorted(f.get_name() for f in context.list_families()) self._lookup = [x.lower() for x in self._families] + # Populate the ListStore with font family names for f in self._families: self._list.append([f]) - cell = gtk.CellRendererText() + # Set up a cell renderer to display the font names + cell = Gtk.CellRendererText() self.pack_start(cell, True) self.add_attribute(cell, 'text', 0) - fam = self.get_pango_context().get_font_description().get_family() + # Set the default font family to the system's default + fam = context.get_font_description().get_family() self.set_family(fam) def set_family(self, family): + """Set the active font family in the ComboBox""" try: index = self._lookup.index(family.lower()) self.set_active(index) - except: + except ValueError: pass def get_family(self): - return self._families[self.get_active()] + """Get the currently selected font family""" + active = self.get_active() + if active != -1: # Check if a valid item is selected + return self._families[active] + return None + + def get_pango_context_fixed(self): + # Directly call Gtk.Widget's get_pango_context or create a new Pango.Context + return super().get_pango_context() # Call parent method + + # Original method retained but not used, to avoid conflicts + def get_pango_context(self): + return self.get_pango_context_fixed() # Redirect to new method \ No newline at end of file diff --git a/keepnote/gui/icon_menu.py b/keepnote/gui/icon_menu.py index 1efa526e8..fd3901d1b 100644 --- a/keepnote/gui/icon_menu.py +++ b/keepnote/gui/icon_menu.py @@ -1,146 +1,103 @@ -""" - - KeepNote - Change Node Icon Submenu - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gobject -import gtk +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, GObject +# KeepNote imports import keepnote.gui.icons -from keepnote.gui.icons import \ - lookup_icon_filename - +from keepnote.gui.icons import lookup_icon_filename +# Default menu icons (excluding "-open" variants, limited to 20) default_menu_icons = [x for x in keepnote.gui.icons.builtin_icons if "-open." not in x][:20] - -class IconMenu (gtk.Menu): +class IconMenu(Gtk.Popover): """Icon picker menu""" def __init__(self): - gtk.Menu.__init__(self) + super().__init__() self._notebook = None + self.width = 4 # Number of icons per row + self.grid = Gtk.Grid() # Use a grid for icon layout + self.grid.set_column_spacing(5) + self.grid.set_row_spacing(5) - # default icon - self.default_icon = gtk.MenuItem("_Default Icon") - self.default_icon.connect("activate", - lambda w: self.emit("set-icon", "")) - self.default_icon.show() - - # new icon - self.new_icon = gtk.MenuItem("_More Icons...") - self.new_icon.show() - - self.width = 4 - self.posi = 0 - self.posj = 0 + # Set the grid as the popover's child + self.set_child(self.grid) + # Setup menu initially self.setup_menu() def clear(self): - """clear menu""" - self.foreach(lambda item: self.remove(item)) - self.posi = 0 - self.posj = 0 + """Clear the menu""" + child = self.grid.get_first_child() + while child: + next_child = child.get_next_sibling() + self.grid.remove(child) + child = next_child def set_notebook(self, notebook): """Set notebook for menu""" if self._notebook is not None: - # disconnect from old notebook - self._notebook.pref.quick_pick_icons_changed.remove( - self.setup_menu) + # Disconnect from old notebook + self._notebook.pref.quick_pick_icons_changed.remove(self.setup_menu) self._notebook = notebook if self._notebook is not None: - # listener to new notebook + # Listen to new notebook self._notebook.pref.quick_pick_icons_changed.add(self.setup_menu) self.setup_menu() def setup_menu(self): """Update menu to reflect notebook""" - self.clear() + # Add icons if self._notebook is None: - for iconfile in default_menu_icons: - self.add_icon(iconfile) + icons = default_menu_icons else: - for iconfile in self._notebook.pref.get_quick_pick_icons(): - self.add_icon(iconfile) + icons = self._notebook.pref.get_quick_pick_icons() + + for i, iconfile in enumerate(icons): + self.add_icon(iconfile, i) - # separator - item = gtk.SeparatorMenuItem() - item.show() - self.append(item) + # Add separator (using a horizontal separator widget) + separator = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL) + self.grid.attach(separator, 0, len(icons) // self.width + 1, self.width, 1) - # default icon - self.append(self.default_icon) + # Default icon button + default_button = Gtk.Button(label="_Default Icon") + default_button.connect("clicked", lambda w: self.emit("set-icon", "")) + self.grid.attach(default_button, 0, len(icons) // self.width + 2, self.width, 1) - # new icon - self.append(self.new_icon) + # New icon button + self.new_icon = Gtk.Button(label="_More Icons...") + self.new_icon.connect("clicked", lambda w: self.emit("new-icon-activated")) # Custom signal for new icon + self.grid.attach(self.new_icon, 0, len(icons) // self.width + 3, self.width, 1) - # make changes visible - self.unrealize() - self.realize() + def add_icon(self, iconfile, index): + """Add an icon to the menu""" + button = Gtk.Button() + iconfile2 = lookup_icon_filename(self._notebook, iconfile) - def append_grid(self, item): - self.attach(item, self.posj, self.posj+1, self.posi, self.posi+1) + if isinstance(iconfile2, Gtk.Widget): # Paintable + img = iconfile2 + else: # string path fallback + img = Gtk.Image.new_from_file(iconfile2) - self.posj += 1 - if self.posj >= self.width: - self.posj = 0 - self.posi += 1 + button.set_child(img) + button.connect("clicked", lambda w: self.emit("set-icon", iconfile)) - def append(self, item): - # reset posi, posj - if self.posj > 0: - self.posi += 1 - self.posj = 0 + # Calculate grid position + row = index // self.width + col = index % self.width + self.grid.attach(button, col, row, 1, 1) - gtk.Menu.append(self, item) - def add_icon(self, iconfile): - child = gtk.MenuItem("") - child.remove(child.child) - img = gtk.Image() - iconfile2 = lookup_icon_filename(self._notebook, iconfile) - img.set_from_file(iconfile2) - child.add(img) - child.child.show() - child.show() - child.connect("activate", - lambda w: self.emit("set-icon", iconfile)) - self.append_grid(child) - - -gobject.type_register(IconMenu) -gobject.signal_new("set-icon", IconMenu, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) +# Register the custom signals for IconMenu +GObject.type_register(IconMenu) +GObject.signal_new("set-icon", IconMenu, GObject.SignalFlags.RUN_LAST, None, (str,)) +GObject.signal_new("new-icon-activated", IconMenu, GObject.SignalFlags.RUN_LAST, None, ()) \ No newline at end of file diff --git a/keepnote/gui/icons.py b/keepnote/gui/icons.py index 1aa32fcc5..958f761a7 100644 --- a/keepnote/gui/icons.py +++ b/keepnote/gui/icons.py @@ -1,253 +1,155 @@ -""" - - KeepNote - Module for managing node icons in KeepNote - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# icons.py (GTK4-Compatible Full Rewrite) + +# Python 3 and PyGObject imports import mimetypes import os +import gi -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk +gi.require_version('Gtk', '4.0') +from gi.repository import Gtk, Gdk -# keepnote imports +# KeepNote imports import keepnote -from keepnote import unicode_gtk import keepnote.gui -from keepnote import get_resource +from keepnote.util.platform import get_resource import keepnote.notebook as notebooklib - -#============================================================================= -# globals/constants - -NODE_ICON_DIR = os.path.join(u"images", u"node_icons") +# Constants and globals +NODE_ICON_DIR = os.path.join("images", "node_icons") _g_default_node_icon_filenames = { - notebooklib.CONTENT_TYPE_TRASH: (u"trash.png", u"trash.png"), - notebooklib.CONTENT_TYPE_DIR: (u"folder.png", u"folder-open.png"), - notebooklib.CONTENT_TYPE_PAGE: (u"note.png", u"note.png") + notebooklib.CONTENT_TYPE_TRASH: ("trash.png", "trash.png"), + notebooklib.CONTENT_TYPE_DIR: ("folder.png", "folder-open.png"), + notebooklib.CONTENT_TYPE_PAGE: ("note.png", "note.png") } _g_unknown_icons = ("note-unknown.png", "note-unknown.png") +_colors = ["", "-red", "-orange", "-yellow", + "-green", "-blue", "-violet", "-grey"] -_colors = [u"", u"-red", u"-orange", u"-yellow", - u"-green", u"-blue", u"-violet", u"-grey"] - -builtin_icons = [u"folder" + c + u".png" for c in _colors] + \ - [u"folder" + c + u"-open.png" for c in _colors] + \ - [u"note" + c + u".png" for c in _colors] + \ - [u"star.png", - u"heart.png", - u"check.png", - u"x.png", - - u"important.png", - u"question.png", - u"web.png", - u"note-unknown.png"] - -DEFAULT_QUICK_PICK_ICONS = [u"folder" + c + u".png" for c in _colors] + \ - [u"note" + c + u".png" for c in _colors] + \ - [u"star.png", - u"heart.png", - u"check.png", - u"x.png", - - u"important.png", - u"question.png", - u"web.png", - u"note-unknown.png"] - - -#============================================================================= -# node icons +builtin_icons = ["folder" + c + ".png" for c in _colors] + \ + ["folder" + c + "-open.png" for c in _colors] + \ + ["note" + c + ".png" for c in _colors] + \ + ["star.png", "heart.png", "check.png", "x.png", + "important.png", "question.png", "web.png", "note-unknown.png"] +DEFAULT_QUICK_PICK_ICONS = ["folder" + c + ".png" for c in _colors] + \ + ["note" + c + ".png" for c in _colors] + \ + ["star.png", "heart.png", "check.png", "x.png", + "important.png", "question.png", "web.png", "note-unknown.png"] +# GTK4 Compatible MimeIcons class class MimeIcons: - def __init__(self): - self.theme = gtk.icon_theme_get_default() - if self.theme is None: - icons = [] - else: - icons = self.theme.list_icons() - self._icons = set(icons) + display = Gdk.Display.get_default() # GTK4 change + self.theme = Gtk.IconTheme.get_for_display(display) + self._icons = set(self.theme.get_icon_names()) if self.theme else set() self._cache = {} def get_icon(self, filename, default=None): - """Try to find icon for filename""" - - # get mime type - mime_type = mimetypes.guess_type(filename)[0].replace("/", "-") + mime_type = mimetypes.guess_type(filename)[0] + if mime_type: + mime_type = mime_type.replace("/", "-") + else: + mime_type = "unknown" return self.get_icon_mimetype(mime_type, default) def get_icon_mimetype(self, mime_type, default=None): - """Try to find icon for mime type""" - - # search in the cache if mime_type in self._cache: return self._cache[mime_type] - # try gnome mime - items = mime_type.split('/') - for i in xrange(len(items), 0, -1): - icon_name = u"gnome-mime-" + '-'.join(items[:i]) + parts = mime_type.split('/') + for i in range(len(parts), 0, -1): + icon_name = "gnome-mime-" + '-'.join(parts[:i]) if icon_name in self._icons: self._cache[mime_type] = icon_name - return unicode(icon_name) + return icon_name - # try simple mime - for i in xrange(len(items), 0, -1): - icon_name = u'-'.join(items[:i]) + for i in range(len(parts), 0, -1): + icon_name = '-'.join(parts[:i]) if icon_name in self._icons: self._cache[mime_type] = icon_name return icon_name - # file icon self._cache[mime_type] = default return default def get_icon_filename(self, name, default=None): if name is None or self.theme is None: return default - size = 16 - info = self.theme.lookup_icon(name, size, 0) - if info: - return unicode_gtk(info.get_filename()) - else: - return default + paintable = self.theme.lookup_icon( + name, + [], # fallback names + size, + 1, # scale + Gtk.TextDirection.NONE, + Gtk.IconLookupFlags.FORCE_REGULAR + ) + return paintable if paintable else default -# singleton _g_mime_icons = MimeIcons() - def get_icon_filename(icon_name, default=None): return _g_mime_icons.get_icon_filename(icon_name, default) - -# HACK: cache icon filenames _icon_basename_cache = {} - def lookup_icon_filename(notebook, basename): - """ - Lookup full filename of a icon from a notebook and builtins - Returns None if not found - notebook can be None - """ - - # try cache first if (notebook, basename) in _icon_basename_cache: return _icon_basename_cache[(notebook, basename)] - # lookup in notebook icon store - if notebook is not None: + if notebook: filename = notebook.get_icon_file(basename) - if filename: + if filename and os.path.isfile(filename): _icon_basename_cache[(notebook, basename)] = filename return filename - # lookup in builtins filename = get_resource(NODE_ICON_DIR, basename) if os.path.isfile(filename): _icon_basename_cache[(notebook, basename)] = filename return filename - # lookup mime types - filename = _g_mime_icons.get_icon_filename(basename) - _icon_basename_cache[(notebook, basename)] = filename - return filename - + result = _g_mime_icons.get_icon_filename(basename, default=basename) + if isinstance(result, str): + return result # fallback to basename if not found + elif result is not None: + return Gtk.Image.new_from_paintable(result) # return image widget + else: + return basename -#============================================================================= def get_default_icon_basenames(node): - """Returns basesnames for default icons for a node""" content_type = node.get_attr("content_type") - default = _g_mime_icons.get_icon_mimetype( - content_type, u"note-unknown.png") - basenames = _g_default_node_icon_filenames.get(content_type, - (default, default)) - return basenames - - #if basenames is None: - # return _g_unknown_icons - + default = _g_mime_icons.get_icon_mimetype(content_type, "note-unknown.png") + return _g_default_node_icon_filenames.get(content_type, (default, default)) def get_default_icon_filenames(node): - """Returns NoteBookNode icon filename from resource path""" - filenames = get_default_icon_basenames(node) - - # lookup filenames - return [lookup_icon_filename(node.get_notebook(), filenames[0]), - lookup_icon_filename(node.get_notebook(), filenames[1])] - + basenames = get_default_icon_basenames(node) + return [lookup_icon_filename(node.get_notebook(), basenames[0]), + lookup_icon_filename(node.get_notebook(), basenames[1])] def get_all_icon_basenames(notebook): - """ - Return a list of all builtin icons and notebook-specific icons - Icons are referred to by basename - """ return builtin_icons + notebook.get_icons() - def guess_open_icon_filename(icon_file): - """ - Guess an 'open' version of an icon from its closed version - Accepts basenames and full filenames - """ path, ext = os.path.splitext(icon_file) - return path + u"-open" + ext - + return path + "-open" + ext def get_node_icon_filenames_basenames(node): - - # TODO: merge with get_node_icon_filenames? - notebook = node.get_notebook() - - # get default basenames basenames = list(get_default_icon_basenames(node)) filenames = get_default_icon_filenames(node) - # load icon if node.has_attr("icon"): - # use attr basename = node.get_attr("icon") filename = lookup_icon_filename(notebook, basename) if filename: filenames[0] = filename basenames[0] = basename - # load icon with open state if node.has_attr("icon_open"): - # use attr basename = node.get_attr("icon_open") filename = lookup_icon_filename(notebook, basename) if filename: @@ -255,15 +157,12 @@ def get_node_icon_filenames_basenames(node): basenames[1] = basename else: if node.has_attr("icon"): - - # use icon to guess open icon basename = guess_open_icon_filename(node.get_attr("icon")) filename = lookup_icon_filename(notebook, basename) if filename: filenames[1] = filename basenames[1] = basename else: - # use icon as-is for open icon if it is specified basename = node.get_attr("icon") filename = lookup_icon_filename(notebook, basename) if filename: @@ -272,91 +171,64 @@ def get_node_icon_filenames_basenames(node): return basenames, filenames - def get_node_icon_basenames(node): return get_node_icon_filenames_basenames(node)[0] - def get_node_icon_filenames(node): - """Loads the icons for a node""" return get_node_icon_filenames_basenames(node)[1] - -# TODO: continue to clean up class - -class NoteBookIconManager (object): +class NoteBookIconManager: def __init__(self): self.pixbufs = None self._node_icon_cache = {} - def get_node_icon(self, node, effects=set()): + def get_node_icon(self, node, effects=None): + if effects is None: + effects = set() if self.pixbufs is None: self.pixbufs = keepnote.gui.pixbufs expand = "expand" in effects fade = "fade" in effects - icon_size = (15, 15) - icon_cache, icon_open_cache = self._node_icon_cache.get( - node, (None, None)) + icon_cache, icon_open_cache = self._node_icon_cache.get(node, (None, None)) if not expand and icon_cache: - # return loaded icon - if not fade: - return self.pixbufs.get_pixbuf(icon_cache, icon_size) - else: - return self.get_node_icon_fade(icon_cache, icon_size) - + return self._resolve_icon(icon_cache, icon_size, fade) elif expand and icon_open_cache: - # return loaded icon with open state - if not fade: - return self.pixbufs.get_pixbuf(icon_open_cache, icon_size) - else: - self.get_node_icon_fade(icon_open_cache, icon_size) - + return self._resolve_icon(icon_open_cache, icon_size, fade) else: - # load icons and return the one requested filenames = get_node_icon_filenames(node) self._node_icon_cache[node] = filenames - if not fade: - return self.pixbufs.get_pixbuf( - filenames[int(expand)], icon_size) - else: - return self.get_node_icon_fade( - filenames[int(expand)], icon_size) + return self._resolve_icon(filenames[int(expand)], icon_size, fade) + + def _resolve_icon(self, filename, size, fade): + if not fade: + if not isinstance(filename, str): + return None + return self.pixbufs.get_pixbuf(filename, size) - def get_node_icon_fade(self, filename, icon_size, fade_alpha=128): + return self.get_node_icon_fade(filename, size) - key = (filename, icon_size, "fade") + def get_node_icon_fade(self, filename, size, fade_alpha=128): + key = (filename, size, "fade") cached = self.pixbufs.is_pixbuf_cached(key) - pixbuf = self.pixbufs.get_pixbuf(filename, icon_size, key) + pixbuf = self.pixbufs.get_pixbuf(filename, size, key) if cached: return pixbuf - else: - pixbuf = keepnote.gui.fade_pixbuf(pixbuf, fade_alpha) - self.pixbufs.cache_pixbuf(pixbuf, key) - return pixbuf + pixbuf = keepnote.gui.fade_pixbuf(pixbuf, fade_alpha) + self.pixbufs.cache_pixbuf(pixbuf, key) + return pixbuf def uncache_node_icon(self, node): - if node in self._node_icon_cache: - del self._node_icon_cache[node] - + self._node_icon_cache.pop(node, None) -# singleton (for now) notebook_icon_manager = NoteBookIconManager() - def get_node_icon(node, expand=False, fade=False): - """Returns pixbuf of NoteBookNode icon from resource path""" - effects = set() - if expand: - effects.add("expand") - if fade: - effects.add("fade") - + effects = {e for e, b in [("expand", expand), ("fade", fade)] if b} return notebook_icon_manager.get_node_icon(node, effects) - def uncache_node_icon(node): - notebook_icon_manager.uncache_node_icon(node) + notebook_icon_manager.uncache_node_icon(node) \ No newline at end of file diff --git a/keepnote/gui/link_editor.py b/keepnote/gui/link_editor.py index 230cbb93e..deb2cdcdf 100644 --- a/keepnote/gui/link_editor.py +++ b/keepnote/gui/link_editor.py @@ -1,47 +1,17 @@ -""" - - KeepNote - Link Editor Widget - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gobject -import gtk - -# keepnote imports -from keepnote import unicode_gtk -from keepnote.notebook import get_node_url - +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, Gdk, GLib -# TODO: make more checks for start, end not None +# KeepNote imports +from keepnote.util.platform import unicode_gtk +from keepnote.notebook import get_node_url -class LinkEditor (gtk.Frame): +class LinkEditor(Gtk.Frame): """Widget for editing KeepNote links""" def __init__(self): - gtk.Frame.__init__(self, "Link editor") + super().__init__(label="Link editor") self.use_text = False self.current_url = None @@ -55,39 +25,48 @@ def set_textview(self, textview): self.textview = textview def layout(self): - # layout - self.set_no_show_all(True) - - self.align = gtk.Alignment() - self.add(self.align) - self.align.set_padding(5, 5, 5, 5) - self.align.set(0, 0, 1, 1) - - self.show() - self.align.show_all() - - vbox = gtk.VBox(False, 5) - self.align.add(vbox) - - hbox = gtk.HBox(False, 5) - #self.align.add(hbox) - vbox.pack_start(hbox, True, True, 0) - - label = gtk.Label("url:") - hbox.pack_start(label, False, False, 0) - label.set_alignment(0, .5) - self.url_text = gtk.Entry() - hbox.pack_start(self.url_text, True, True, 0) - self.url_text.set_width_chars(-1) - self.url_text.connect("key-press-event", self._on_key_press_event) - self.url_text.connect("focus-in-event", self._on_url_text_start) - self.url_text.connect("focus-out-event", self._on_url_text_done) + # Layout + self.set_visible(False) # Replaces set_no_show_all(True) + + self.align = Gtk.Box() # Gtk.Alignment is deprecated, using Gtk.Box instead + self.align.set_margin_start(5) + self.align.set_margin_end(5) + self.align.set_margin_top(5) + self.align.set_margin_bottom(5) + self.set_child(self.align) # Changed from add to set_child + + vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5) + self.align.append(vbox) # Changed from add to append + + hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5) + vbox.append(hbox) # Changed from pack_start to append + + label = Gtk.Label(label="url:") + hbox.append(label) # Changed from pack_start to append + label.set_halign(Gtk.Align.START) # Replaces set_xalign + label.set_valign(Gtk.Align.CENTER) # Replaces set_yalign + + self.url_text = Gtk.Entry() + hbox.append(self.url_text) # Changed from pack_start to append + + # Replace "key-press-event" with EventControllerKey + key_controller = Gtk.EventControllerKey.new() + key_controller.connect("key-pressed", self._on_key_press_event) + self.url_text.add_controller(key_controller) + + # Replace "focus-in-event" and "focus-out-event" with EventControllerFocus + focus_controller = Gtk.EventControllerFocus.new() + focus_controller.connect("enter", self._on_url_text_start) + focus_controller.connect("leave", self._on_url_text_done) + self.url_text.add_controller(focus_controller) + + # Connect "changed" and "activate" signals (still valid in GTK 4) self.url_text.connect("changed", self._on_url_text_changed) self.url_text.connect("activate", self._on_activate) - self._liststore = gtk.ListStore(gobject.TYPE_STRING, - gobject.TYPE_STRING) - self.completion = gtk.EntryCompletion() + # Completion setup + self._liststore = Gtk.ListStore.new([str, str]) + self.completion = Gtk.EntryCompletion() self.completion.connect("match-selected", self._on_completion_match) self.completion.set_match_func(self._match_func) self.completion.set_model(self._liststore) @@ -95,18 +74,13 @@ def layout(self): self.url_text.set_completion(self.completion) self._ignore_text = False - #self.use_text_check = gtk.CheckButton("_use text as url") - #vbox.pack_start(self.use_text_check, False, False, 0) - #self.use_text_check.connect("toggled", self._on_use_text_toggled) - #self.use_text = self.use_text_check.get_active() - if not self.active: - self.hide() + self.set_visible(False) def set_search_nodes(self, search): self.search_nodes = search - def _match_func(self, completion, key_string, iter): + def _match_func(self, completion, key_string, iter, *args): return True def _on_url_text_changed(self, url_text): @@ -114,7 +88,7 @@ def _on_url_text_changed(self, url_text): self.update_completion() def update_completion(self): - text = unicode_gtk(self.url_text.get_text()) + text = self.url_text.get_text() self._liststore.clear() if self.search_nodes and len(text) > 0: @@ -130,20 +104,10 @@ def _on_completion_match(self, completion, model, iter): self._ignore_text = False self.dismiss(True) - def _on_use_text_toggled(self, check): - self.use_text = check.get_active() - - if self.use_text and self.current_url is not None: - self.url_text.set_text(self.current_url) - self.url_text.set_sensitive(False) - self.set_url() - else: - self.url_text.set_sensitive(True) - - def _on_url_text_done(self, widget, event): + def _on_url_text_done(self, controller): self.set_url() - def _on_url_text_start(self, widget, event): + def _on_url_text_start(self, controller): if self.textview: tag, start, end = self.textview.get_link() if tag: @@ -156,7 +120,7 @@ def set_url(self): if self.textview is None: return - url = unicode_gtk(self.url_text.get_text()) + url = self.url_text.get_text() tag, start, end = self.textview.get_link() if start is not None: @@ -169,23 +133,22 @@ def on_font_change(self, editor, font): """Callback for when font changes under richtext cursor""" if font.link: self.active = True - self.url_text.set_width_chars(-1) - self.show() - self.align.show_all() + self.set_visible(True) self.current_url = font.link.get_href() self._ignore_text = True self.url_text.set_text(self.current_url) self._ignore_text = False if self.textview: - gobject.idle_add( - lambda: self.textview.scroll_mark_onscreen( - self.textview.get_buffer().get_insert())) + def scroll_to_mark(): + self.textview.scroll_to_mark(self.textview.get_buffer().get_insert(), 0.0, False, 0.0, 0.0) + return False + GLib.idle_add(scroll_to_mark) elif self.active: self.set_url() self.active = False - self.hide() + self.set_visible(False) self.current_url = None self.url_text.set_text("") @@ -202,9 +165,11 @@ def edit(self): def _on_activate(self, entry): self.dismiss(True) - def _on_key_press_event(self, widget, event): - if event.keyval == gtk.keysyms.Escape: + def _on_key_press_event(self, controller, keyval, keycode, state): + if keyval == Gdk.KEY_Escape: self.dismiss(False) + return True + return False def dismiss(self, set_url): if self.textview is None: @@ -214,10 +179,4 @@ def dismiss(self, set_url): if end: if set_url: self.set_url() - #self.textview.get_buffer().place_cursor(end) - else: - # DEBUG - #print "NO LINK" - pass - - self.textview.grab_focus() + self.textview.grab_focus() \ No newline at end of file diff --git a/keepnote/gui/linkcomplete.py b/keepnote/gui/linkcomplete.py index 7b552e592..e7c2e3fba 100644 --- a/keepnote/gui/linkcomplete.py +++ b/keepnote/gui/linkcomplete.py @@ -1,88 +1,84 @@ +# Python 3 and PyGObject imports +import gi +gi.require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, Gdk, GObject -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gobject - -# keepnote imports -from keepnote import unicode_gtk +# KeepNote imports +from keepnote.util.platform import unicode_gtk from keepnote.gui.popupwindow import PopupWindow - -class LinkPicker (gtk.TreeView): +class LinkPicker(Gtk.TreeView): + """A TreeView for displaying and selecting links""" def __init__(self, maxwidth=450): - gtk.TreeView.__init__(self) + super().__init__() self._maxwidth = maxwidth self.set_headers_visible(False) - # add column - self.column = gtk.TreeViewColumn() + # Add column + self.column = Gtk.TreeViewColumn() self.append_column(self.column) - # create a cell renderers - self.cell_icon = gtk.CellRendererPixbuf() - self.cell_text = gtk.CellRendererText() + # Create cell renderers + self.cell_icon = Gtk.CellRendererPixbuf() + self.cell_text = Gtk.CellRendererText() - # add the cells to column + # Add the cells to the column self.column.pack_start(self.cell_icon, False) self.column.pack_start(self.cell_text, True) - # map cells to columns in treestore + # Map cells to columns in the treestore self.column.add_attribute(self.cell_icon, 'pixbuf', 0) self.column.add_attribute(self.cell_text, 'text', 1) - self.list = gtk.ListStore(gtk.gdk.Pixbuf, str, object) + # Create a ListStore for pixbuf, text, and nodeid + self.list = Gtk.ListStore.new([GdkPixbuf.Pixbuf, str, object]) self.set_model(self.list) self.maxlinks = 10 def set_links(self, urls): + """Set the links to display in the TreeView""" self.list.clear() for nodeid, url, icon in urls[:self.maxlinks]: self.list.append([icon, url, nodeid]) self.column.queue_resize() - w, h = self.size_request() - if w > self._maxwidth: - self.set_size_request(self._maxwidth, -1) - else: - self.set_size_request(-1, -1) - + # Adjust size based on content + # In GTK 4, get_preferred_size() is replaced with measure() and compute_size() + # For simplicity, we'll set a fixed size request for now + self.set_size_request(self._maxwidth, -1) -class LinkPickerPopup (PopupWindow): +class LinkPickerPopup(PopupWindow): + """A popup window for selecting links using LinkPicker""" def __init__(self, parent, maxwidth=100): - PopupWindow.__init__(self, parent) + super().__init__(parent) self._maxwidth = maxwidth self._link_picker = LinkPicker() - self._link_picker.show() - self._link_picker.get_selection().connect( - "changed", self.on_select_changed) + self._link_picker.get_selection().connect("changed", self.on_select_changed) self._cursor_move = False self._shown = False - # use frame for border - frame = gtk.Frame() - frame.set_shadow_type(gtk.SHADOW_ETCHED_IN) - frame.add(self._link_picker) - frame.show() - self.add(frame) + # Use frame for border + frame = Gtk.Frame() + frame.set_has_frame(True) # Replaces set_shadow_type + frame.set_child(self._link_picker) # Changed from add to set_child + self.set_child(frame) # Changed from add to set_child def set_links(self, urls): """Set links in popup""" self._link_picker.set_links(urls) if len(urls) == 0: - self.hide() + self.set_visible(False) self._shown = False else: - self.show() + self.set_visible(True) self._shown = True def shown(self): @@ -93,63 +89,64 @@ def on_key_press_event(self, widget, event): """Callback for key press events""" model, sel = self._link_picker.get_selection().get_selected() - if event.keyval == gtk.keysyms.Down: - # move selection down + # In GTK 4, event.keyval is replaced with event.get_keyval()[1] + keyval = event.get_keyval()[1] + + if keyval == Gdk.KEY_Down: + # Move selection down self._cursor_move = True if sel is None: self._link_picker.set_cursor((0,)) else: - i = model.get_path(sel)[0] + i = model.get_path(sel).get_indices()[0] n = model.iter_n_children(None) if i < n - 1: - self._link_picker.set_cursor((i+1,)) + self._link_picker.set_cursor((i + 1,)) return True - elif event.keyval == gtk.keysyms.Up: - # move selection up + elif keyval == Gdk.KEY_Up: + # Move selection up self._cursor_move = True if sel is None: n = model.iter_n_children(None) - self._link_picker.set_cursor((n-1,)) + self._link_picker.set_cursor((n - 1,)) else: - i = model.get_path(sel)[0] + i = model.get_path(sel).get_indices()[0] if i > 0: - self._link_picker.set_cursor((i-1,)) + self._link_picker.set_cursor((i - 1,)) return True - elif event.keyval == gtk.keysyms.Return: - # accept selection + elif keyval == Gdk.KEY_Return: + # Accept selection if sel: icon, title, nodeid = model[sel] - self.emit("pick-link", unicode_gtk(title), nodeid) + self.emit("pick-link", title, nodeid) return True - elif event.keyval == gtk.keysyms.Escape: - # discard popup + elif keyval == Gdk.KEY_Escape: + # Discard popup self.set_links([]) return False def on_select_changed(self, treeselect): - + """Callback for selection changes""" if not self._cursor_move: model, sel = self._link_picker.get_selection().get_selected() if sel: icon, title, nodeid = model[sel] - self.emit("pick-link", unicode_gtk(title), nodeid) + self.emit("pick-link", title, nodeid) self._cursor_move = False - #model, paths = treeselect.get_selected_rows() - #self.__sel_nodes = [self.model.get_value(self.model.get_iter(path), - # self._node_col) - # for path in paths] - +# Note: GObject.signal_new is not needed in GTK 4 for custom signals. +# We assume the signal "pick-link" is handled by KeepNote's custom signal system. -gobject.type_register(LinkPickerPopup) -gobject.signal_new("pick-link", LinkPickerPopup, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str, object)) +# Register the custom signal for LinkPickerPopup +GObject.type_register(LinkPickerPopup) +GObject.signal_new("pick-link", LinkPickerPopup, GObject.SignalFlags.RUN_LAST, + None, (str, object)) \ No newline at end of file diff --git a/keepnote/gui/listview.py b/keepnote/gui/listview.py index 6e31fe95e..0eddb1ada 100644 --- a/keepnote/gui/listview.py +++ b/keepnote/gui/listview.py @@ -1,35 +1,13 @@ -""" - - KeepNote - ListView - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -from gtk import gdk +# PyGObject imports +from gi import require_version +require_version('Gtk', '4.0') # Specify GTK 4.0 +from gi.repository import Gtk, Gdk +import warnings + +warnings.filterwarnings("ignore", category=DeprecationWarning) + +# KeepNote imports from keepnote.gui import basetreeview from keepnote.gui import treemodel import keepnote @@ -37,49 +15,80 @@ _ = keepnote.translate - DEFAULT_ATTR_COL_WIDTH = 150 DEFAULT_TITLE_COL_WIDTH = 250 -class KeepNoteListView (basetreeview.KeepNoteBaseTreeView): +class KeepNoteListView(basetreeview.KeepNoteBaseTreeView): def __init__(self): - basetreeview.KeepNoteBaseTreeView.__init__(self) + super().__init__() self._sel_nodes = None self._columns_set = False self._current_table = "default" self._col_widths = {} self.time_edit_format = "%Y/%m/%d %H:%M:%S" - # configurable callback for setting window status + # Configurable callback for setting window status self.on_status = None - # selection config - self.get_selection().set_mode(gtk.SELECTION_MULTIPLE) - - # init view - self.connect("key-release-event", self.on_key_released) - self.connect("button-press-event", self.on_button_press) + # Selection config + self.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) + + # Init view + # + controller = Gtk.EventControllerKey() + controller.connect("key-released", self.on_key_released) + self.add_controller(controller) + controller = Gtk.EventControllerKey() + controller.connect("key-released", self.on_key_released) + self.add_controller(controller) + + gesture = Gtk.GestureClick() + gesture.connect("pressed", self.on_button_press) + self.add_controller(gesture) self.connect("row-expanded", self._on_listview_row_expanded) self.connect("row-collapsed", self._on_listview_row_collapsed) - self.connect("columns-changed", self._on_columns_changed) + self.connect("notify::columns", self._on_columns_changed) - self.set_rules_hint(True) +# GTK4 不再支持 set_enable_tree_lines / Gtk.TreeViewLines +# 如需类似效果，可使用 CSS 设置网格线，如 grid-lines: both; self.set_fixed_height_mode(True) self.set_sensitive(False) - # init model - self.set_model(gtk.TreeModelSort(treemodel.KeepNoteTreeModel())) + # Init model + self.set_model(Gtk.TreeModelSort.new_with_model(treemodel.KeepNoteTreeModel())) self.setup_columns() def load_preferences(self, app_pref, first_open=False): """Load application preferences""" - self.set_date_formats(app_pref.get("timestamp_formats")) - self.set_rules_hint( - app_pref.get("look_and_feel", "listview_rules", - default=True)) + + # 原来的写法有 default 参数，dict 不支持这个 + formats = app_pref.get("timestamp_formats") + if not formats: + formats = ["%Y-%m-%d %H:%M:%S"] + self.set_date_formats(formats) + + # GTK4 不再支持 set_enable_grid_lines，建议用 CSS 设置 + rules_enabled = False + look_and_feel = app_pref.get("look_and_feel", {}) + if isinstance(look_and_feel, dict): + rules_enabled = look_and_feel.get("listview_rules", True) + + if rules_enabled: + # 使用 CSS 设置网格线效果 + css_provider = Gtk.CssProvider() + css_provider.load_from_data(b""" + treeview cell { + border-bottom: 1px solid #ccc; + border-right: 1px solid #ccc; + padding: 2px; + } + """) + + style_context = self.get_style_context() + style_context.add_provider(css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) def save_preferences(self, app_pref): """Save application preferences""" @@ -91,13 +100,13 @@ def set_notebook(self, notebook): self._notebook.get_listeners("table_changed").remove( self._on_table_changed) - basetreeview.KeepNoteBaseTreeView.set_notebook(self, notebook) + super().set_notebook(notebook) if self.rich_model is not None: self.rich_model.set_root_nodes([]) if notebook: - # load notebook prefs + # Load notebook prefs self.set_sensitive(True) notebook.get_listeners("table_changed").add(self._on_table_changed) else: @@ -116,19 +125,17 @@ def save(self): self._notebook.mark_modified() def _save_column_widths(self): - # save attr column widths + # Save attr column widths widths = self._notebook.get_attr("column_widths", {}) for col in self.get_columns(): widths[col.attr] = col.get_width() self._notebook.set_attr("column_widths", widths) def _save_column_order(self): - # save column attrs + # Save column attrs table = self._notebook.attr_tables.get(self._current_table) table.attrs = [col.attr for col in self.get_columns()] - # TODO: notify table change - def _load_column_widths(self): widths = self._notebook.get_attr("column_widths", {}) for col in self.get_columns(): @@ -139,20 +146,19 @@ def _load_column_widths(self): def _load_column_order(self): current_attrs = [col.attr for col in self.get_columns()] - table = self._notebook.attr_tables.get(self._current_table) if table.attrs != current_attrs: if set(current_attrs) == set(table.attrs): - # only order changed - lookup = dict((col.attr, col) for col in self.get_columns()) + # Only order changed + lookup = {col.attr: col for col in self.get_columns()} prev = None for attr in table.attrs: col = lookup[attr] self.move_column_after(col, prev) prev = col else: - # resetup all columns + # Resetup all columns self.setup_columns() def _on_table_changed(self, notebook, table): @@ -160,73 +166,67 @@ def _on_table_changed(self, notebook, table): self._load_column_widths() self._load_column_order() - #================================== - # model and view setup + # ================================== + # Model and view setup def set_model(self, model): - basetreeview.KeepNoteBaseTreeView.set_model(self, model) - self.model.connect("sort-column-changed", self._sort_column_changed) + super().set_model(model) + if model: + self.model.connect("sort-column-changed", self._sort_column_changed) def setup_columns(self): - self.clear_columns() if self._notebook is None: self._columns_set = False return - # TODO: eventually columns may change when ever master node changes - attrs = self._notebook.attr_tables.get(self._current_table).attrs + # 获取属性表，确保不为空 + attrs = self._notebook.attr_tables.get(self._current_table) + if not attrs or not attrs.attrs: + attrs.attrs = ["title", "created_time"] # 默认列 - # add columns - for attr in attrs: + # 添加列 + for attr in attrs.attrs: col = self._add_column(attr) - col.set_reorderable(True) # allow column reordering + col.set_reorderable(True) if attr == self._attr_title: self.title_column = col - # add model columns + # 添加模型列 self._add_model_column("order") - # NOTE: must create a new TreeModelSort whenever we add new columns - # to the rich_model that could be used in sorting - # Perhaps something is being cached - self.set_model(gtk.TreeModelSort(self.rich_model)) + # 创建排序模型 + if self.rich_model is None: + self.rich_model = treemodel.KeepNoteTreeModel() + self.set_model(Gtk.TreeModelSort.new_with_model(self.rich_model)) - # config columns view + # 配置列视图 self.set_expander_column(self.get_column(0)) - # TODO: load correct sorting right away - # set default sorting - # remember sort per node - self.model.set_sort_column_id( - self.rich_model.get_column_by_name("order").pos, - gtk.SORT_ASCENDING) + # 设置默认排序 + order_col = self.rich_model.get_column_by_name("order") + if order_col and self.model and self.rich_model.get_n_columns() > 0: + self.model.set_sort_column_id(order_col.pos, Gtk.SortType.ASCENDING) + else: + print("Warning: Skipping sort setup - model not fully initialized") self.set_reorder(basetreeview.REORDER_ALL) self._columns_set = True def _add_column(self, attr, cell_attr=None): - - # get attribute definition from notebook attr_def = self._notebook.attr_defs.get(attr) + datatype = attr_def.datatype if attr_def else "string" + col_title = attr_def.name if attr_def else attr - # get datatype - if attr_def is not None: - datatype = attr_def.datatype - col_title = attr_def.name - else: - datatype = "string" - col_title = attr + # 确保模型列存在 + if not self.rich_model.get_column_by_name(attr): + self._add_model_column(attr) - # get/make model column - self._add_model_column(attr) - - # create column view - column = gtk.TreeViewColumn() + column = Gtk.TreeViewColumn() column.attr = attr - column.set_property("sizing", gtk.TREE_VIEW_COLUMN_FIXED) - column.set_property("resizable", True) + column.set_sizing(Gtk.TreeViewColumnSizing.FIXED) + column.set_resizable(True) column.connect("notify::width", self._on_column_width_change) column.set_min_width(10) column.set_fixed_width( @@ -234,42 +234,37 @@ def _add_column(self, attr, cell_attr=None): attr, DEFAULT_ATTR_COL_WIDTH)) column.set_title(col_title) - # define column sorting + # Define column sorting attr_sort = attr + "_sort" col = self.rich_model.get_column_by_name(attr_sort) if col: column.set_sort_column_id(col.pos) - # add cell renders + # Add cell renderers if attr == self._attr_title: self._add_title_render(column, attr) elif datatype == "timestamp": self._add_text_render( column, attr, editable=True, validator=basetreeview.TextRendererValidator( - lambda x: keepnote.timestamp.format_timestamp( - x, self.time_edit_format), - lambda x: keepnote.timestamp.parse_timestamp( - x, self.time_edit_format))) + lambda x: keepnote.timestamp.format_timestamp(x, self.time_edit_format) if x else "", + lambda x: keepnote.timestamp.parse_timestamp(x, self.time_edit_format) if x else 0)) else: self._add_text_render(column, attr) self.append_column(column) - return column - #============================================= - # gui callbacks + # ============================================= + # GUI callbacks def is_node_expanded(self, node): return node.get_attr("expanded2", False) def set_node_expanded(self, node, expand): - - # don't save the expand state of the master node if len(treemodel.get_path_from_node( - self.model, node, - self.rich_model.get_node_column_pos())) > 1: + self.model, node, + self.rich_model.get_node_column_pos())) > 1: node.set_attr("expanded2", expand) def _sort_column_changed(self, sortmodel): @@ -283,67 +278,59 @@ def _update_reorder(self): else: col = self.rich_model.get_column(col_id) - if col is None: # or col.attr == "order" - self.model.set_sort_column_id( - self.rich_model.get_column_by_name("order").pos, - gtk.SORT_ASCENDING) + if col is None: + order_col = self.rich_model.get_column_by_name("order") + if order_col and self.model and self.rich_model.get_n_columns() > 0: + self.model.set_sort_column_id(order_col.pos, Gtk.SortType.ASCENDING) + self.set_reorder(basetreeview.REORDER_ALL) + else: + print("Warning: Skipping reorder - model not fully initialized") self.set_reorder(basetreeview.REORDER_ALL) else: self.set_reorder(basetreeview.REORDER_FOLDER) def on_key_released(self, widget, event): """Callback for key release events""" - - # no special processing while editing nodes if self.editing_path: return - if event.keyval == gtk.keysyms.Delete: - # capture node deletes + # In GTK 4, event.keyval is replaced with event.get_keyval()[1] + keyval = event.get_keyval()[1] + state = event.get_state()[1] # In GTK 4, get_state() returns a tuple + + if keyval == Gdk.KEY_Delete: self.stop_emission("key-release-event") self.emit("delete-node", self.get_selected_nodes()) - elif (event.keyval == gtk.keysyms.BackSpace and - event.state & gdk.CONTROL_MASK): - # capture goto parent node + elif keyval == Gdk.KEY_BackSpace and state & Gdk.ModifierType.CONTROL_MASK: self.stop_emission("key-release-event") self.emit("goto-parent-node") - elif (event.keyval == gtk.keysyms.Return and - event.state & gdk.CONTROL_MASK): - # capture goto node + elif keyval == Gdk.KEY_Return and state & Gdk.ModifierType.CONTROL_MASK: self.stop_emission("key-release-event") self.emit("activate-node", None) def on_button_press(self, widget, event): if event.button == 3: - # popup menu return self.popup_menu(event.x, event.y, event.button, event.time) - if event.button == 1 and event.type == gtk.gdk._2BUTTON_PRESS: + if event.button == 1 and event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS: # Changed from _2BUTTON_PRESS model, paths = self.get_selection().get_selected_rows() - # double click --> goto node if len(paths) > 0: nodes = [ self.model.get_value(self.model.get_iter(x), self.rich_model.get_node_column_pos()) for x in paths] - - # NOTE: can only view one node self.emit("activate-node", nodes[0]) def is_view_tree(self): - - # TODO: document this more return self.get_master_node() is not None def _on_columns_changed(self, treeview): """Callback for when columns change order""" - if not self._columns_set: return - # config columns view col = self.get_column(0) if col: self.set_expander_column(col) @@ -353,8 +340,7 @@ def _on_columns_changed(self, treeview): self._notebook.get_listeners("table_changed").notify( self._notebook, self._current_table) - def _on_column_width_change(self, col, width): - + def _on_column_width_change(self, col, pspec): width = col.get_width() if (self._notebook and self._col_widths.get(col.attr, None) != width): @@ -363,61 +349,39 @@ def _on_column_width_change(self, col, width): self._notebook.get_listeners("table_changed").notify( self._notebook, self._current_table) - #==================================================== - # actions + # ==================================================== + # Actions def view_nodes(self, nodes, nested=True): - # TODO: learn how to deactivate expensive sorting - #self.model.set_default_sort_func(None) - #self.model.set_sort_column_id(-1, gtk.SORT_ASCENDING) - - # save sorting if a single node was selected - if self._sel_nodes is not None and len(self._sel_nodes) == 1: - self.save_sorting(self._sel_nodes[0]) - + print(f"List view_nodes called with nodes: {[node.get_title() for node in nodes]}") if len(nodes) > 1: nested = False self._sel_nodes = nodes self.rich_model.set_nested(nested) - # set master node self.set_master_node(None) + self.rich_model.set_root_nodes(nodes) - # populate model - roots = nodes - self.rich_model.set_root_nodes(roots) - - # load sorting if single node is selected if len(nodes) == 1: self.load_sorting(nodes[0], self.model) - # expand rows - for node in roots: - self.expand_to_path(treemodel.get_path_from_node( - self.model, node, self.rich_model.get_node_column_pos())) - - # disable if no roots - if len(roots) == 0: - self.set_sensitive(False) - else: - self.set_sensitive(True) + for node in nodes: + # Convert tuple to Gtk.TreePath + path_tuple = treemodel.get_path_from_node( + self.model, node, self.rich_model.get_node_column_pos()) + path = Gtk.TreePath.new_from_indices(path_tuple) + self.expand_to_path(path) - # update status + self.set_sensitive(len(nodes) > 0) self.display_page_count() self.emit("select-nodes", []) def get_root_nodes(self): - """Returns the root nodes displayed in listview""" - if self.rich_model: - return self.rich_model.get_root_nodes() - else: - return [] + return self.rich_model.get_root_nodes() if self.rich_model else [] def append_node(self, node): - - # do not allow appending of nodes unless we are masterless if self.get_master_node() is not None: return @@ -429,9 +393,6 @@ def append_node(self, node): self.set_sensitive(True) - # update status - #self.display_page_count() - def display_page_count(self, npages=None): if npages is None: npages = self.count_pages(self.get_root_nodes()) @@ -442,12 +403,10 @@ def display_page_count(self, npages=None): self.set_status(_("1 page"), "stats") def count_pages(self, roots): - # TODO: is there a way to make this faster? - def walk(node): npages = 1 if (self.rich_model.get_nested() and - (node.get_attr("expanded2", False))): + node.get_attr("expanded2", False)): for child in node.get_children(): npages += walk(child) return npages @@ -459,53 +418,34 @@ def edit_node(self, page): path = treemodel.get_path_from_node( self.model, page, self.rich_model.get_node_column_pos()) if path is None: - # view page first if not in view self.emit("goto-node", page) path = treemodel.get_path_from_node( self.model, page, self.rich_model.get_node_column_pos()) assert path is not None self.set_cursor_on_cell(path, self.title_column, self.title_text, True) path, col = self.get_cursor() - self.scroll_to_cell(path) - - #def cancel_editing(self): - # # TODO: add this - # pass - # #self.cell_text.stop_editing(True) + self.scroll_to_cell(path, col, False, 0.0, 0.0) # Updated for GTK 4 def save_sorting(self, node): - """Save sorting information into node""" info_sort, sort_dir = self.model.get_sort_column_id() + sort_dir = 1 if sort_dir == Gtk.SortType.ASCENDING else 0 - if sort_dir == gtk.SORT_ASCENDING: - sort_dir = 1 - else: - sort_dir = 0 - - if info_sort is None or info_sort < 0: - col = self.rich_model.get_column_by_name("order") - else: - col = self.rich_model.get_column(info_sort) + col = (self.rich_model.get_column_by_name("order") + if info_sort is None or info_sort < 0 + else self.rich_model.get_column(info_sort)) if col.attr: node.set_attr("info_sort", col.attr) node.set_attr("info_sort_dir", sort_dir) def load_sorting(self, node, model): - """Load sorting information from node""" info_sort = node.get_attr("info_sort", "order") sort_dir = node.get_attr("info_sort_dir", 1) + sort_dir = Gtk.SortType.ASCENDING if sort_dir else Gtk.SortType.DESCENDING - if sort_dir: - sort_dir = gtk.SORT_ASCENDING - else: - sort_dir = gtk.SORT_DESCENDING - - # default sorting if info_sort == "": info_sort = "order" - # TODO: do not rely on *_sort convention for col in self.rich_model.get_columns(): if info_sort == col.attr and col.name.endswith("_sort"): model.set_sort_column_id(col.pos, sort_dir) @@ -517,20 +457,16 @@ def set_status(self, text, bar="status"): self.on_status(text, bar=bar) def _on_node_changed_end(self, model, nodes): - basetreeview.KeepNoteBaseTreeView._on_node_changed_end( - self, model, nodes) + super()._on_node_changed_end(model, nodes) - # make sure root is always expanded if self.rich_model.get_nested(): - # determine root set child = model.iter_children(None) while child is not None: self.expand_row(model.get_path(child), False) child = model.iter_next(child) def _on_listview_row_expanded(self, treeview, it, path): - """Callback for row expand""" self.display_page_count() def _on_listview_row_collapsed(self, treeview, it, path): - self.display_page_count() + self.display_page_count() \ No newline at end of file diff --git a/keepnote/gui/main_window.py b/keepnote/gui/main_window.py index 486b25edb..d01192f4e 100644 --- a/keepnote/gui/main_window.py +++ b/keepnote/gui/main_window.py @@ -1,48 +1,23 @@ -""" - - KeepNote - Graphical User Interface for KeepNote Application - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python imports import os import shutil import sys import uuid -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gobject +# PyGObject imports +from gi import require_version +require_version('Gtk', '4.0') +from gi.repository import Gtk, Gdk, GLib, Gio +import warnings +warnings.filterwarnings("ignore", category=DeprecationWarning) -# keepnote imports +# KeepNote imports import keepnote from keepnote import \ KeepNoteError, \ ensure_unicode, \ - unicode_gtk, \ FS_ENCODING +from keepnote.util.platform import unicode_gtk from keepnote.notebook import \ NoteBookError from keepnote import notebook as notebooklib @@ -54,255 +29,220 @@ FileChooserDialog, \ init_key_shortcuts, \ UIManager - from keepnote.gui import \ dialog_drag_drop_test, \ dialog_wait from keepnote.gui.tabbed_viewer import TabbedViewer - _ = keepnote.translate -#============================================================================= -# constants - +# Constants DEFAULT_WINDOW_SIZE = (1024, 600) DEFAULT_WINDOW_POS = (-1, -1) - -#============================================================================= - - -class KeepNoteWindow (gtk.Window): - """Main windows for KeepNote""" +class KeepNoteWindow(Gtk.Window): + """Main window for KeepNote""" def __init__(self, app, winid=None): - gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL) - + super().__init__() + self._widgets = {} # Initialize the _widgets attribute as an empty dictionary self._app = app # application object - self._winid = winid if winid else unicode(uuid.uuid4()) + if self._app is None: + print("ERROR: _app is not initialized.") + return + self._winid = winid if winid else str(uuid.uuid4()) self._viewers = [] - # window state - self._maximized = False # True if window is maximized - self._was_maximized = False # True if iconified and was maximized - self._iconified = False # True if window is minimized - self._tray_icon = None # True if tray icon is present + # Window state + self._maximized = False + self._was_maximized = False + self._iconified = False + self._tray_icon = None self._recent_notebooks = [] - self._uimanager = UIManager() - self._accel_group = self._uimanager.get_accel_group() - self.add_accel_group(self._accel_group) - init_key_shortcuts() + # Use Gtk ShortcutController for shortcuts in GTK 4 + self._shortcut_controller = Gtk.ShortcutController() + self.add_controller(self._shortcut_controller) + + self.init_shortcuts() # Replace init_key_shortcuts self.init_layout() + + self.setup_systray() - # load preferences for the first time + # Load preferences for the first time self.load_preferences(True) + def set_application(self, app): + self._app = app # Ensure _app is correctly set + def get_id(self): return self._winid + def init_shortcuts(self): + """Initialize keyboard shortcuts for GTK 4""" + shortcuts = [ + ("O", self.on_open_notebook), + ("S", lambda: self._app.save()), + ("Q", self.on_quit), + ("Z", self.on_undo), + ("Z", self.on_redo), + ("X", self.on_cut), + ("C", self.on_copy), + ("C", self.on_copy_tree), + ("V", self.on_paste), + ("K", lambda: self.search_box.grab_focus() if hasattr(self, 'search_box') else None), + ] + + for trigger, callback in shortcuts: + shortcut = Gtk.Shortcut.new( + Gtk.ShortcutTrigger.parse_string(trigger), + Gtk.CallbackAction.new(callback) + ) + self._shortcut_controller.add_shortcut(shortcut) + def init_layout(self): - # init main window + # Init main window + print("🟩 init_layout: setting window title & size") # 👈 日志 self.set_title(keepnote.PROGRAM_NAME) self.set_default_size(*DEFAULT_WINDOW_SIZE) - self.set_icon_list(get_resource_pixbuf("keepnote-16x16.png"), - get_resource_pixbuf("keepnote-32x32.png"), - get_resource_pixbuf("keepnote-64x64.png")) - - # main window signals - self.connect("error", lambda w, m, e, t: self.error(m, e, t)) - self.connect("delete-event", lambda w, e: self._on_close()) - self.connect("window-state-event", self._on_window_state) - self.connect("size-allocate", self._on_window_size) - #self._app.pref.changed.add(self._on_app_options_changed) - - #==================================== - # Dialogs + self.set_icon_name("keepnote.py") - self.drag_test = dialog_drag_drop_test.DragDropTestDialog(self) + # Main window signals + # self.connect("error", lambda w, m, e, t: self.error(m, e, t)) + self.connect("close-request", self._on_close) + self.connect("notify::maximized", self._on_window_state) + # self.connect("size-allocate", self._on_window_size) // 原始的gtk3的写法 下面是gtk4的写法下面两行就是替换这行的 + self.connect("notify::default-width", self._on_window_size) + self.connect("notify::default-height", self._on_window_size) + print("🧱 init_layout: creating DragDropTestDialog") # 👈 日志 + # Dialogs + self.drag_test = dialog_drag_drop_test.DragDropTestDialog(self) + print("🧱 init_layout: creating viewer") # 👈 日志 self.viewer = self.new_viewer() - #==================================== # Layout - - # vertical box - main_vbox = gtk.VBox(False, 0) - self.add(main_vbox) - - # menu bar - main_vbox.set_border_width(0) + print("📦 init_layout: setting main_vbox") # 👈 日志 + main_vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + self.set_child(main_vbox) + print("➕ Adding main_vbox1") + # Menu bar + main_vbox.set_margin_start(0) + main_vbox.set_margin_end(0) + main_vbox.set_margin_top(0) + main_vbox.set_margin_bottom(0) self.menubar = self.make_menubar() - main_vbox.pack_start(self.menubar, False, True, 0) - - # toolbar - main_vbox.pack_start(self.make_toolbar(), False, True, 0) + main_vbox.append(self.menubar) + + # Toolbar + main_vbox.append(self.make_toolbar()) + + main_vbox2 = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + print("➕ Adding main_vbox2") + main_vbox2.set_margin_start(1) + main_vbox2.set_margin_end(1) + main_vbox2.set_margin_top(1) + main_vbox2.set_margin_bottom(1) + main_vbox.append(main_vbox2) + + # Viewer + self.viewer_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + print("➕ Adding viewer_box") + main_vbox2.append(self.viewer_box) + + # Status bar + status_hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0) + print("➕ Adding status_hbox") + main_vbox.append(status_hbox) + + self.status_bar = Gtk.Statusbar() + if self.status_bar.get_parent(): + self.status_bar.unparent() + print("➕ Adding status_bar") + status_hbox.append(self.status_bar) - main_vbox2 = gtk.VBox(False, 0) - main_vbox2.set_border_width(1) - main_vbox.pack_start(main_vbox2, True, True, 0) - - # viewer - self.viewer_box = gtk.VBox(False, 0) - main_vbox2.pack_start(self.viewer_box, True, True, 0) - - # status bar - status_hbox = gtk.HBox(False, 0) - main_vbox.pack_start(status_hbox, False, True, 0) - - # message bar - self.status_bar = gtk.Statusbar() - status_hbox.pack_start(self.status_bar, False, True, 0) - self.status_bar.set_property("has-resize-grip", False) self.status_bar.set_size_request(300, -1) - # stats bar - self.stats_bar = gtk.Statusbar() - status_hbox.pack_start(self.stats_bar, True, True, 0) - - #==================================================== - # viewer - - self.viewer_box.pack_start(self.viewer, True, True, 0) - - # add viewer menus + self.stats_bar = Gtk.Statusbar() + if self.stats_bar.get_parent(): + self.stats_bar.unparent() + print("➕ Adding stats_bar") + status_hbox.append(self.stats_bar) + + # Viewer + print("➕ Adding viewer to viewer_box") + if self.viewer.get_parent(): + self.viewer.unparent() + self.viewer_box.append(self.viewer) + print("📦 Calling viewer.add_ui()") self.viewer.add_ui(self) + self.show() # 确保主窗口被 GTK4 正确挂载 def setup_systray(self): - """Setup systray for window""" - # system tray icon - if gtk.gtk_version > (2, 10): - if not self._tray_icon: - self._tray_icon = gtk.StatusIcon() - self._tray_icon.set_from_pixbuf( - get_resource_pixbuf("keepnote-32x32.png")) - self._tray_icon.set_tooltip(keepnote.PROGRAM_NAME) - self._statusicon_menu = self.make_statusicon_menu() - self._tray_icon.connect("activate", - self._on_tray_icon_activate) - self._tray_icon.connect('popup-menu', - self._on_systray_popup_menu) - - self._tray_icon.set_property( - "visible", self._app.pref.get("window", "use_systray", - default=True)) - - else: - self._tray_icon = None + """Setup system tray for window""" + # print("Warning: System tray (Gtk.StatusIcon) is not supported in GTK 4. This feature is disabled.") + self._tray_icon = None def _on_systray_popup_menu(self, status, button, time): - self._statusicon_menu.popup(None, None, None, button, time) - - #============================================== - # viewers + pass # System tray not supported in GTK 4 + # Viewers def new_viewer(self): - """Creates a new viewer for this window""" - - #viewer = ThreePaneViewer(self._app, self) viewer = TabbedViewer(self._app, self) viewer.connect("error", lambda w, m, e: self.error(m, e, None)) viewer.connect("status", lambda w, m, b: self.set_status(m, b)) viewer.connect("window-request", self._on_window_request) viewer.connect("current-node", self._on_current_node) viewer.connect("modified", self._on_viewer_modified) - return viewer def add_viewer(self, viewer): - """Adds a viewer to the window""" self._viewers.append(viewer) def remove_viewer(self, viewer): - """Removes a viewer from the window""" self._viewers.remove(viewer) def get_all_viewers(self): - """Returns list of all viewers associated with window""" return self._viewers def get_all_notebooks(self): - """Returns all notebooks loaded by all viewers""" - return set(filter(lambda n: n is not None, - (v.get_notebook() for v in self._viewers))) - - #=============================================== - # accessors + return set([n for n in (v.get_notebook() for v in self._viewers) if n is not None]) + # Accessors def get_app(self): - """Returns application object""" return self._app - def get_uimanager(self): - """Returns the UIManager for the window""" - return self._uimanager - def get_viewer(self): - """Returns window's viewer""" return self.viewer - def get_accel_group(self): - """Returns the accel group for the window""" - return self._accel_group - def get_notebook(self): - """Returns the currently loaded notebook""" return self.viewer.get_notebook() def get_current_node(self): - """Returns the currently selected node""" return self.viewer.get_current_node() - #========================================================= - # main window gui callbacks - - def _on_window_state(self, window, event): - """Callback for window state""" - iconified = self._iconified - - # keep track of maximized and minimized state - self._iconified = bool(event.new_window_state & - gtk.gdk.WINDOW_STATE_ICONIFIED) - - # detect recent iconification - if not iconified and self._iconified: - # save maximized state before iconification - self._was_maximized = self._maximized - - self._maximized = bool(event.new_window_state & - gtk.gdk.WINDOW_STATE_MAXIMIZED) - - # detect recent de-iconification - if iconified and not self._iconified: - # explicitly maximize if not maximized - # NOTE: this is needed to work around a MS windows GTK bug - if self._was_maximized: - gobject.idle_add(self.maximize) + # Main window GUI callbacks + def _on_window_state(self, obj, param): + surface = self.get_surface() + if surface is not None: + state = surface.get_state() + self._maximized = bool(state & Gdk.ToplevelState.MAXIMIZED) + self._fullscreen = bool(state & Gdk.ToplevelState.FULLSCREEN) + else: + self._maximized = False + self._fullscreen = False - def _on_window_size(self, window, event): - """Callback for resize events""" - # record window size if it is not maximized or minimized + def _on_window_size(self, window, allocation): if not self._maximized and not self._iconified: - self._app.pref.get("window")["window_size"] = self.get_size() - - #def _on_app_options_changed(self): - # self.load_preferences() + self._app.pref.get("window")["window_size"] = (allocation.width, allocation.height) def _on_tray_icon_activate(self, icon): - """Try icon has been clicked in system tray""" - if self.is_active(): - self.minimize_window() - else: - self.restore_window() - - #============================================================= - # viewer callbacks + pass # System tray not supported in GTK 4 + # Viewer callbacks def _on_window_request(self, viewer, action): - """Callback for requesting an action from the main window""" if action == "minimize": self.minimize_window() elif action == "restore": @@ -310,233 +250,260 @@ def _on_window_request(self, viewer, action): else: raise Exception("unknown window request: " + str(action)) - #================================================= # Window manipulation - def minimize_window(self): - """Minimize the window (block until window is minimized""" if self._iconified: return - - # TODO: add timer in case minimize fails - def on_window_state(window, event): - if event.new_window_state & gtk.gdk.WINDOW_STATE_ICONIFIED: - gtk.main_quit() - sig = self.connect("window-state-event", on_window_state) - self.iconify() - gtk.main() - self.disconnect(sig) + self.minimize() + self._iconified = True def restore_window(self): - """Restore the window from minimization""" - self.deiconify() + self.unminimize() self.present() + self._iconified = False def on_new_window(self): - """Open a new window""" win = self._app.new_window() notebook = self.get_notebook() if notebook: self._app.ref_notebook(notebook) win.set_notebook(notebook) - #============================================== # Application preferences - def load_preferences(self, first_open=False): - """Load preferences""" p = self._app.pref - - # notebook - window_size = p.get("window", "window_size", - default=DEFAULT_WINDOW_SIZE) - window_maximized = p.get("window", "window_maximized", default=True) + # window_size = p.get("window", "window_size", default=DEFAULT_WINDOW_SIZE) + window_section = p.get("window", {}) + if not isinstance(window_section, dict): + print("[warn] config 'window_section' expected dict but got", type(window_section)) + window_section = {} + window_size = window_section.get("window_size", DEFAULT_WINDOW_SIZE) + + print(f"window_size: {window_size} (type: {type(window_size)})") + if isinstance(window_size, str): + try: + width, height = map(int, window_size.replace(" ", "").split(",")) + window_size = (width, height) + except (ValueError, TypeError) as e: + print(f"Error parsing window_size '{window_size}': {e}. Using default.") + window_size = DEFAULT_WINDOW_SIZE + if not isinstance(window_size, (tuple, list)) or len(window_size) != 2: + window_size = DEFAULT_WINDOW_SIZE + print(f"Parsed window_size: {window_size}") + + window_section2 = p.get("window", {}) + if not isinstance(window_section2, dict): + print("[warn] config 'window_section2' expected dict but got", type(window_section2)) + window_section2 = {} + + window_maximized = window_section2.get("window_maximized", True) self.setup_systray() - use_systray = p.get("window", "use_systray", default=True) - # window config for first open + window_section3 = p.get("window", {}) + if not isinstance(window_section3, dict): + print("[warn] config 'window_section3' expected dict but got", type(window_section3)) + window_section3 = {} + + use_systray = window_section3.get("use_systray", True) + if first_open: - self.resize(*window_size) + self.set_default_size(*window_size) if window_maximized: self.maximize() + window_section4 = p.get("window", {}) + if not isinstance(window_section4, dict): + print("[warn] config 'window_section4' expected dict but got", type(window_section4)) + window_section4 = {} + + if use_systray and window_section4.get("minimize_on_start", False): + self.minimize() + + # GTK 4 中不再支持隐藏标题栏，下面的调用被移除 + # window_section5 = p.get("window", {}) + # skip = window_section5.get("skip_taskbar", False) + # if use_systray: + # self.set_hide_titlebar_when_maximized(skip) + # 可选日志说明 + print("GTK 4: set_hide_titlebar_when_maximized is no longer supported. Ignoring skip_taskbar setting.") + # self.set_keep_above(keep_above) + print("GTK 4: 'set_keep_above' is no longer supported. Ignoring 'keep_above' setting.") + # window_section6 = p.get("window", {}) + # keep_above = window_section6.get("keep_above", False) + # self.set_keep_above(keep_above) + # window_section7 = p.get("window", {}) + # if window_section7.get("stick", False): + # self.stick() + # else: + # self.unstick() + + # Load recent notebooks + + self._recent_notebooks = p.get("recent_notebooks", []) + if first_open and not self._recent_notebooks: + default_path = os.path.join(keepnote.get_user_pref_dir(), "DefaultNotebook") + if not os.path.exists(default_path): + self.new_notebook(default_path) + self._recent_notebooks = [default_path] + self.set_recent_notebooks_menu(self._recent_notebooks) - minimize = p.get("window", "minimize_on_start", default=False) - if use_systray and minimize: - self.iconify() - - # config window - skip = p.get("window", "skip_taskbar", default=False) - if use_systray: - self.set_property("skip-taskbar-hint", skip) - - self.set_keep_above(p.get("window", "keep_above", default=False)) + # Ensure a notebook is opened + if self._recent_notebooks and not self.get_notebook(): + if not isinstance(self._recent_notebooks, list): + print("[warn] config '_recent_notebooks' expected list but got", type(self._recent_notebooks)) + self._recent_notebooks = [] - if p.get("window", "stick", default=False): - self.stick() - else: - self.unstick() + if self._recent_notebooks: + self.open_notebook(self._recent_notebooks[0]) - # other window wide properties - self._recent_notebooks = p.get("recent_notebooks", default=[]) - self.set_recent_notebooks_menu(self._recent_notebooks) - - self._uimanager.set_force_stock( - p.get("look_and_feel", "use_stock_icons", default=False)) self.viewer.load_preferences(self._app.pref, first_open) def save_preferences(self): - """Save preferences""" p = self._app.pref - - # save window preferences p.set("window", "window_maximized", self._maximized) p.set("recent_notebooks", self._recent_notebooks) - - # let viewer save preferences self.viewer.save_preferences(self._app.pref) - def set_recent_notebooks_menu(self, recent_notebooks): - """Set the recent notebooks in the file menu""" - menu = self._uimanager.get_widget( - "/main_menu_bar/File/Open Recent Notebook") - - # init menu - if menu.get_submenu() is None: - submenu = gtk.Menu() - submenu.show() - menu.set_submenu(submenu) - menu = menu.get_submenu() - - # clear menu - menu.foreach(lambda x: menu.remove(x)) - - def make_filename(filename, maxsize=30): - if len(filename) > maxsize: - base = os.path.basename(filename) - pre = max(maxsize - len(base), 10) - return os.path.join(filename[:pre] + u"...", base) - else: - return filename - - def make_func(filename): - return lambda w: self.open_notebook(filename) - - # populate menu - for i, notebook in enumerate(recent_notebooks): - item = gtk.MenuItem(u"%d. %s" % (i+1, make_filename(notebook))) - item.connect("activate", make_func(notebook)) - item.show() - menu.append(item) + def set_recent_notebooks_menu(self, recent_list): + """ + Populate the recent notebooks section inside the File menu dynamically. + """ + if not hasattr(self, 'file_menu_model'): + return # file_menu_model not ready yet + # Remove previous section + if hasattr(self, 'recent_section_index'): + try: + self.file_menu_model.remove(self.recent_section_index) + except Exception: + pass + + # Create new menu section + recent_menu = Gio.Menu() + for i, path in enumerate(recent_list): + action_name = f"open_recent_{i}" + label = os.path.basename(path) + recent_menu.append(label, f"win.{action_name}") + + if not self.win_actions.has_action(action_name): + action = Gio.SimpleAction.new(action_name, None) + action.connect("activate", lambda a, p, pth=path: self.on_open_notebook_file(pth)) + self.win_actions.add_action(action) + + self.file_menu_model.insert_section(1, "Recent Notebooks", recent_menu) + self.recent_section_index = 1 + + def open_notebook_file(self, path): + """ + Open a notebook by file path — called by recent menu actions. + Returns the notebook object, or None on failure. + """ + try: + from keepnote.notebook import NoteBook + notebook = NoteBook() + notebook.load(path) + self.notebook = notebook # 或写成 self.attach_notebook(notebook) + if notebook.index_needed(): + self.update_index(notebook) + return notebook + except Exception as e: + print(f"[ERROR] Failed to open notebook at {path}: {e}") + return None def add_recent_notebook(self, filename): - """Add recent notebook""" - if filename in self._recent_notebooks: self._recent_notebooks.remove(filename) - - self._recent_notebooks = [filename] + \ - self._recent_notebooks[:keepnote.gui.MAX_RECENT_NOTEBOOKS] - + self._recent_notebooks = [filename] + self._recent_notebooks[:keepnote.gui.MAX_RECENT_NOTEBOOKS] self.set_recent_notebooks_menu(self._recent_notebooks) - #============================================= # Notebook open/save/close UI - def on_new_notebook(self): - """Launches New NoteBook dialog""" - dialog = FileChooserDialog( - _("New Notebook"), self, - action=gtk.FILE_CHOOSER_ACTION_SAVE, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("New"), gtk.RESPONSE_OK), - app=self._app, - persistent_path="new_notebook_path") - response = dialog.run() + print("========start new notebook thread========") + dialog = Gtk.FileChooserDialog( + title=_("New Notebook"), + parent=self, + action=Gtk.FileChooserAction.SAVE, + buttons=(_("Cancel"), Gtk.ResponseType.CANCEL, + _("New"), Gtk.ResponseType.OK) + ) - if response == gtk.RESPONSE_OK: - # create new notebook - if dialog.get_filename(): - self.new_notebook(unicode_gtk(dialog.get_filename())) + response = dialog.run() + if response == Gtk.ResponseType.OK and dialog.get_filename(): + filename = unicode_gtk(dialog.get_filename()) + self.new_notebook(filename) dialog.destroy() def on_open_notebook(self): - """Launches Open NoteBook dialog""" - - dialog = gtk.FileChooserDialog( - _("Open Notebook"), self, - action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, - buttons=(_("Cancel"), gtk.RESPONSE_CANCEL, - _("Open"), gtk.RESPONSE_OK)) + dialog = Gtk.FileChooserDialog( + title=_("Open Notebook"), parent=self, + action=Gtk.FileChooserAction.SELECT_FOLDER, + buttons=(_("Cancel"), Gtk.ResponseType.CANCEL, + _("Open"), Gtk.ResponseType.OK)) + + content_area = dialog.get_content_area() + content_area.set_margin_start(5) + content_area.set_margin_end(5) + content_area.set_margin_top(5) + content_area.set_margin_bottom(5) def on_folder_changed(filechooser): - folder = unicode_gtk(filechooser.get_current_folder()) + folder = unicode_gtk(filechooser.get_current_folder_file().get_path()) if os.path.exists(os.path.join(folder, notebooklib.PREF_FILE)): - filechooser.response(gtk.RESPONSE_OK) + filechooser.response(Gtk.ResponseType.OK) dialog.connect("current-folder-changed", on_folder_changed) path = self._app.get_default_path("new_notebook_path") if os.path.exists(path): - dialog.set_current_folder(path) - - file_filter = gtk.FileFilter() - file_filter.add_pattern("*.nbk") - file_filter.set_name(_("Notebook (*.nbk)")) - dialog.add_filter(file_filter) + dialog.set_current_folder_file(Gio.File.new_for_path(path)) - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern("*") file_filter.set_name(_("All files (*.*)")) dialog.add_filter(file_filter) - response = dialog.run() + file_filter = Gtk.FileFilter() + file_filter.add_pattern("*.nbk") + file_filter.set_name(_("Notebook (*.nbk)")) + dialog.add_filter(file_filter) - if response == gtk.RESPONSE_OK: + response = dialog.run() - path = ensure_unicode(dialog.get_current_folder(), FS_ENCODING) + if response == Gtk.ResponseType.OK: + path = ensure_unicode(dialog.get_current_folder_file().get_path(), FS_ENCODING) if path: - self._app.pref.set("default_paths", "new_notebook_path", - os.path.dirname(path)) - - notebook_file = ensure_unicode(dialog.get_filename(), FS_ENCODING) + self._app.pref.set("default_paths", "new_notebook_path", os.path.dirname(path)) + notebook_file = ensure_unicode(dialog.get_file().get_path(), FS_ENCODING) if notebook_file: self.open_notebook(notebook_file) dialog.destroy() def on_open_notebook_url(self): - """Launches Open NoteBook from URL dialog""" - dialog = gtk.Dialog("Open Notebook from URL", self, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT) + dialog = Gtk.Dialog( + title="Open Notebook from URL", + parent=self, + flags=Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT + ) p = dialog.get_content_area() + h = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + p.append(h) - h = gtk.HBox() - h.show() - p.pack_start(h, expand=False, fill=True, padding=0) - - # url label - l = gtk.Label("URL: ") - l.show() - h.pack_start(l, expand=False, fill=True, padding=0) + l = Gtk.Label(label="URL: ") + h.append(l) - # url entry - entry = gtk.Entry() + entry = Gtk.Entry() entry.set_width_chars(80) - entry.connect("activate", lambda w: - dialog.response(gtk.RESPONSE_OK)) - entry.show() - h.pack_start(entry, expand=True, fill=True, padding=0) + entry.connect("activate", lambda w: dialog.response(Gtk.ResponseType.OK)) + h.append(entry) - # actions - dialog.add_button("_Cancel", gtk.RESPONSE_CANCEL) - dialog.add_button("_Open", gtk.RESPONSE_OK) + dialog.add_button("_Cancel", Gtk.ResponseType.CANCEL) + dialog.add_button("_Open", Gtk.ResponseType.OK) response = dialog.run() - if response == gtk.RESPONSE_OK: + if response == Gtk.ResponseType.OK: url = unicode_gtk(entry.get_text()) if url: self.open_notebook(url) @@ -544,297 +511,181 @@ def on_open_notebook_url(self): dialog.destroy() def _on_close(self): - """Callback for window close""" try: - # TODO: decide if a clipboard action is needed before - # closing down. - #clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - #clipboard.set_can_store(None) - #clipboard.store() - self._app.save() self.close_notebook() if self._tray_icon: - # turn off try icon - self._tray_icon.set_property("visible", False) - - except Exception, e: + pass # System tray not supported in GTK 4 + except Exception as e: self.error("Error while closing", e, sys.exc_info()[2]) - return False def close(self): - """Close the window""" self._on_close() - self.emit("delete-event", None) - self.destroy() + self.close() def on_quit(self): - """Quit the application""" self._app.save() self._app.quit() - #=============================================== # Notebook actions - def save_notebook(self, silent=False): - """Saves the current notebook""" try: - # save window information for all notebooks associated with this - # window for notebook in self.get_all_notebooks(): p = notebook.pref.get("windows", "ids", define=True) p[self._winid] = { "viewer_type": self.viewer.get_name(), "viewerid": self.viewer.get_id()} - - # let the viewer save its information self.viewer.save() self.set_status(_("Notebook saved")) - - except Exception, e: + except Exception as e: if not silent: self.error(_("Could not save notebook."), e, sys.exc_info()[2]) self.set_status(_("Error saving notebook")) - return def reload_notebook(self): - """Reload the current NoteBook""" - notebook = self.viewer.get_notebook() if notebook is None: self.error(_("Reloading only works when a notebook is open.")) return - filename = notebook.get_filename() self._app.close_all_notebook(notebook, False) self.open_notebook(filename) - self.set_status(_("Notebook reloaded")) def new_notebook(self, filename): - """Creates and opens a new NoteBook""" if self.viewer.get_notebook() is not None: self.close_notebook() try: - # make sure filename is unicode filename = ensure_unicode(filename, FS_ENCODING) + filename = os.path.normpath(filename) + print(f"Creating notebook at: {filename}") + + parent_dir = os.path.dirname(filename) + if not parent_dir: + parent_dir = os.getcwd() + if not os.path.exists(parent_dir): + raise NoteBookError(f"Parent directory does not exist: '{parent_dir}'") + if not os.access(parent_dir, os.W_OK): + raise NoteBookError(f"No write permission for directory: '{parent_dir}'") + + if os.path.exists(filename): + raise NoteBookError(f"Path already exists: '{filename}'") + notebook = notebooklib.NoteBook() notebook.create(filename) notebook.set_attr("title", os.path.basename(filename)) notebook.close() self.set_status(_("Created '%s'") % notebook.get_title()) - except NoteBookError, e: - self.error(_("Could not create new notebook."), - e, sys.exc_info()[2]) + except NoteBookError as e: + error_msg = f"Could not create new notebook at '{filename}': {str(e)}" + self.error(error_msg, e, sys.exc_info()[2]) self.set_status("") return None return self.open_notebook(filename, new=True) def _load_notebook(self, filename): - """Loads notebook in background with progress bar""" - notebook = self._app.get_notebook(filename, self) + notebook = self.open_notebook_file(filename) if notebook is None: return None - - # check for indexing - # TODO: is this the best place for checking? - # There is a difference between normal incremental indexing - # and indexing due version updating. - # incremental updating (checking a few files that have changed on - # disk) should be done within notebook.load(). - # Whole notebook re-indexing, triggered by version upgrade - # should be done separately, and with a different wait dialog - # clearly indicating that notebook loading is going to take - # longer than usual. if notebook.index_needed(): self.update_index(notebook) - return notebook - def _restore_windows(self, notebook, open_here=True): - """ - Restore multiple windows for notebook - - open_here -- if True, will open notebook in this window - - Cases: - 1. if notebook has no saved windows, just open notebook in this window - 2. if notebook has 1 saved window - if open_here: - open it in this window - else: - if this window has no opened notebooks, - reassign its ids to the notebook and open it here - else - reassign notebooks saved ids to this window and viewer - 3. if notebook has >1 saved windows, open them in their own windows - if this window has no notebook, reassign its id to one of the - saved ids. - - """ - # init window lookup - win_lookup = dict((w.get_id(), w) for w in - self._app.get_windows()) + def _restore_windows(self, notebook, open_here=True): + win_lookup = dict((w.get_id(), w) for w in self._app.get_windows()) def open_in_window(winid, viewerid, notebook): - win = win_lookup.get(winid, None) + win = win_lookup.get(winid) if win is None: - # open new window win = self._app.new_window() win_lookup[winid] = win win._winid = winid if viewerid: win.get_viewer().set_id(viewerid) - - # set notebook self._app.ref_notebook(notebook) win.set_notebook(notebook) - # find out how many windows this notebook had last time - # init viewer if needed windows = notebook.pref.get("windows", "ids", define=True) notebook.pref.get("viewers", "ids", define=True) if len(windows) == 0: - # no presistence info found, just open notebook in this window self.set_notebook(notebook) - elif len(windows) == 1: - # restore a single window - winid, winpref = windows.items()[0] - viewerid = winpref.get("viewerid", None) - + winid, winpref = list(windows.items())[0] + viewerid = winpref.get("viewerid") if viewerid is not None: - if len(self.get_all_notebooks()) == 0: - # no notebooks are open, so it is ok to reassign - # the viewer's id to match the notebook pref + if not self.get_all_notebooks(): self._winid = winid self.viewer.set_id(viewerid) self.set_notebook(notebook) elif open_here: - # TODO: needs more testing - - # notebooks are open, so reassign the notebook's pref to - # match the existing viewer - notebook.pref.set( - "windows", "ids", - {self._winid: - {"viewerid": self.viewer.get_id(), - "viewer_type": self.viewer.get_name()}}) - notebook.pref.set( - "viewers", "ids", self.viewer.get_id(), - notebook.pref.get("viewers", "ids", viewerid, - define=True)) + notebook.pref.set("windows", "ids", {self._winid: {"viewerid": self.viewer.get_id(), "viewer_type": self.viewer.get_name()}}) + notebook.pref.set("viewers", "ids", self.viewer.get_id(), notebook.pref.get("viewers", "ids", viewerid, define=True)) del notebook.pref.get("viewers", "ids")[viewerid] self.set_notebook(notebook) else: - # open in whatever window the notebook wants open_in_window(winid, viewerid, notebook) self._app.unref_notebook(notebook) - elif len(windows) > 1: - # get different kinds of window ids restoring_ids = set(windows.keys()) - #new_ids = restoring_ids - set(win_lookup.keys()) - - if len(self.get_all_notebooks()) == 0: - # special case: if no notebooks opened, then make sure - # to reuse this window - + if not self.get_all_notebooks(): if self._winid not in restoring_ids: - self._winid = iter(restoring_ids).next() - + self._winid = next(iter(restoring_ids)) restoring_ids.remove(self._winid) - viewerid = windows[self._winid].get("viewerid", None) + viewerid = windows[self._winid].get("viewerid") if viewerid: self.viewer.set_id(viewerid) self.set_notebook(notebook) - - # restore remaining windows - while len(restoring_ids) > 0: + while restoring_ids: winid = restoring_ids.pop() - viewerid = windows[winid].get("viewerid", None) + viewerid = windows[winid].get("viewerid") open_in_window(winid, viewerid, notebook) self._app.unref_notebook(notebook) def open_notebook(self, filename, new=False, open_here=True): - """Opens a new notebook""" - - #try: - # filename = notebooklib.normalize_notebook_dirname( - # filename, longpath=False) - #except Exception, e: - # self.error(_("Could note find notebook '%s'.") % filename, e, - # sys.exc_info()[2]) - # notebook = None - #else: - notebook = self._load_notebook(filename) if notebook is None: return - - # setup notebook self._restore_windows(notebook, open_here=open_here) - if not new: self.set_status(_("Loaded '%s'") % notebook.get_title()) self.update_title() - - # save notebook to recent notebooks self.add_recent_notebook(filename) - return notebook def close_notebook(self, notebook=None): - """Close the NoteBook""" if notebook is None: notebook = self.get_notebook() - self.viewer.close_notebook(notebook) self.set_status(_("Notebook closed")) - def _on_close_notebook(self, notebook): - """Callback when notebook is closing""" - pass - def set_notebook(self, notebook): - """Set the NoteBook for the window""" self.viewer.set_notebook(notebook) def update_index(self, notebook=None, clear=False): - """Update notebook index""" - if notebook is None: notebook = self.viewer.get_notebook() if notebook is None: return def update(task): - # erase database first - # NOTE: I do this right now so that corrupt databases can be - # cleared out of the way. if clear: notebook.clear_index() - try: for node in notebook.index_all(): - # terminate if search is canceled if task.aborted(): break - except Exception, e: + except Exception as e: self.error(_("Error during index"), e, sys.exc_info()[2]) task.finish() - # launch task - self.wait_dialog(_("Indexing notebook"), _("Indexing..."), - tasklib.Task(update)) + self.wait_dialog(_("Indexing notebook"), _("Indexing..."), tasklib.Task(update)) def compact_index(self, notebook=None): - """Update notebook index""" if notebook is None: notebook = self.viewer.get_notebook() if notebook is None: @@ -843,58 +694,35 @@ def compact_index(self, notebook=None): def update(task): notebook.index("compact") - # launch task - self.wait_dialog(_("Compacting notebook index"), _("Compacting..."), - tasklib.Task(update)) - - #===================================================== - # viewer callbacks + self.wait_dialog(_("Compacting notebook index"), _("Compacting..."), tasklib.Task(update)) + # Viewer callbacks def update_title(self, node=None): - """Set the modification state of the notebook""" notebook = self.viewer.get_notebook() - if notebook is None: self.set_title(keepnote.PROGRAM_NAME) else: - title = notebook.get_attr("title", u"") + title = notebook.get_attr("title", "") if node is None: node = self.get_current_node() if node is not None: - title += u": " + node.get_attr("title", "") - + title += ": " + node.get_attr("title", "") modified = notebook.save_needed() + self.set_title(f"* {title}" if modified else title) if modified: - self.set_title(u"* %s" % title) self.set_status(_("Notebook modified")) - else: - self.set_title(title) def _on_current_node(self, viewer, node): - """Callback for when viewer changes the current node""" self.update_title(node) def _on_viewer_modified(self, viewer, modified): - """Callback for when viewer has a modified notebook""" self.update_title() - #=========================================================== - # page and folder actions - + # Page and folder actions def get_selected_nodes(self): - """ - Returns list of selected nodes - """ return self.viewer.get_selected_nodes() def confirm_delete_nodes(self, nodes): - """Confirm whether nodes should be deleted""" - - # TODO: move to app? - # TODO: add note names to dialog - # TODO: assume one node is selected - # could make this a stand alone function/dialog box - for node in nodes: if node.get_attr("content_type") == notebooklib.CONTENT_TYPE_TRASH: self.error(_("The Trash folder cannot be deleted."), None) @@ -903,150 +731,103 @@ def confirm_delete_nodes(self, nodes): self.error(_("The top-level folder cannot be deleted."), None) return False - if len(nodes) > 1 or len(nodes[0].get_children()) > 0: - message = _( - "Do you want to delete this note and all of its children?") - else: - message = _("Do you want to delete this note?") - - return self._app.ask_yes_no(message, _("Delete Note"), - parent=self.get_toplevel()) + message = _("Do you want to delete this note and all of its children?") if len(nodes) > 1 or len(nodes[0].get_children()) > 0 else _("Do you want to delete this note?") + return self._app.ask_yes_no(message, _("Delete Note"), parent=self.get_toplevel()) def on_empty_trash(self): - """Empty Trash folder in NoteBook""" - if self.get_notebook() is None: return - try: self.get_notebook().empty_trash() - except NoteBookError, e: + except NoteBookError as e: self.error(_("Could not empty trash."), e, sys.exc_info()[2]) - #================================================= - # action callbacks - + # Action callbacks def on_view_node_external_app(self, app, node=None, kind=None): - """View a node with an external app""" - self._app.save() - - # determine node to view if node is None: nodes = self.get_selected_nodes() - if len(nodes) == 0: + if not nodes: self.emit("error", _("No notes are selected."), None, None) return node = nodes[0] - try: self._app.run_external_app_node(app, node, kind) - except KeepNoteError, e: + except KeepNoteError as e: self.emit("error", e.msg, e, sys.exc_info()[2]) - #===================================================== # Cut/copy/paste - # forward cut/copy/paste to the correct widget - def on_cut(self): - """Cut callback""" widget = self.get_focus() - if gobject.signal_lookup("cut-clipboard", widget) != 0: - widget.emit("cut-clipboard") + if widget and hasattr(widget, "cut_clipboard"): + widget.cut_clipboard() def on_copy(self): - """Copy callback""" widget = self.get_focus() - if gobject.signal_lookup("copy-clipboard", widget) != 0: - widget.emit("copy-clipboard") + if widget and hasattr(widget, "copy_clipboard"): + widget.copy_clipboard() def on_copy_tree(self): - """Copy tree callback""" widget = self.get_focus() - if gobject.signal_lookup("copy-tree-clipboard", widget) != 0: - widget.emit("copy-tree-clipboard") + if widget and hasattr(widget, "copy_tree_clipboard"): + widget.copy_tree_clipboard() def on_paste(self): - """Paste callback""" widget = self.get_focus() - if gobject.signal_lookup("paste-clipboard", widget) != 0: - widget.emit("paste-clipboard") + if widget and hasattr(widget, "paste_clipboard"): + widget.paste_clipboard() def on_undo(self): - """Undo callback""" self.viewer.undo() def on_redo(self): - """Redo callback""" self.viewer.redo() - #=================================================== # Misc. - def view_error_log(self): - """View error in text editor""" - - # windows locks open files - # therefore we should copy error log before viewing it try: filename = os.path.realpath(keepnote.get_user_error_log()) - filename2 = filename + u".bak" + filename2 = filename + ".bak" shutil.copy(filename, filename2) - - # use text editor to view error log self._app.run_external_app("text_editor", filename2) - except Exception, e: - self.error(_("Could not open error log") + ":\n" + str(e), - e, sys.exc_info()[2]) + except Exception as e: + self.error(_("Could not open error log") + ":\n" + str(e), e, sys.exc_info()[2]) def view_config_files(self): - """View config folder in a file explorer""" try: - # use text editor to view error log filename = keepnote.get_user_pref_dir() self._app.run_external_app("file_explorer", filename) - except Exception, e: - self.error(_("Could not open error log") + ":\n" + str(e), - e, sys.exc_info()[2]) + except Exception as e: + self.error(_("Could not open error log") + ":\n" + str(e), e, sys.exc_info()[2]) - #================================================== # Help/about dialog - def on_about(self): - """Display about dialog""" - def func(dialog, link, data): try: self._app.open_webpage(link) - except KeepNoteError, e: + except KeepNoteError as e: self.error(e.msg, e, sys.exc_info()[2]) - gtk.about_dialog_set_url_hook(func, None) - about = gtk.AboutDialog() - about.set_name(keepnote.PROGRAM_NAME) + about = Gtk.AboutDialog() + about.set_program_name(keepnote.PROGRAM_NAME) about.set_version(keepnote.PROGRAM_VERSION_TEXT) about.set_copyright(keepnote.COPYRIGHT) - about.set_logo(get_resource_pixbuf("keepnote-icon.png")) + about.set_logo(get_resource_pixbuf("keepnote.py-icon.png")) about.set_website(keepnote.WEBSITE) - about.set_license(keepnote.LICENSE_NAME) + about.set_license_type(Gtk.License.GPL_2_0) about.set_translator_credits(keepnote.TRANSLATOR_CREDITS) - license_file = keepnote.get_resource(u"rc", u"COPYING") + license_file = keepnote.get_resource("rc", "COPYING") if os.path.exists(license_file): about.set_license(open(license_file).read()) - #about.set_authors(["Matt Rasmussen "]) - about.set_transient_for(self) - about.set_position(gtk.WIN_POS_CENTER_ON_PARENT) - about.connect("response", lambda d, r: about.destroy()) - about.show() + about.connect("activate-link", func) + about.connect("response", lambda d, r: d.destroy()) + about.present() - #=========================================== # Messages, warnings, errors UI/dialogs - def set_status(self, text, bar="status"): - """Sets a status message in the status bar""" if bar == "status": self.status_bar.pop(0) self.status_bar.push(0, text) @@ -1054,496 +835,184 @@ def set_status(self, text, bar="status"): self.stats_bar.pop(0) self.stats_bar.push(0, text) else: - raise Exception("unknown bar '%s'" % bar) + raise Exception(f"unknown bar '{bar}'") def error(self, text, error=None, tracebk=None): - """Display an error message""" self._app.error(text, error, tracebk) def wait_dialog(self, title, text, task, cancel=True): - """Display a wait dialog""" - - # NOTE: pause autosave while performing long action - self._app.pause_auto_save(True) - dialog = dialog_wait.WaitDialog(self) dialog.show(title, text, task, cancel=cancel) - self._app.pause_auto_save(False) - #================================================ # Menus - - def get_actions(self): - actions = map( - lambda x: Action(*x), - [ - ("File", None, _("_File")), - - ("New Notebook", gtk.STOCK_NEW, _("_New Notebook..."), - "", _("Start a new notebook"), - lambda w: self.on_new_notebook()), - - ("Open Notebook", gtk.STOCK_OPEN, _("_Open Notebook..."), - "O", _("Open an existing notebook"), - lambda w: self.on_open_notebook()), - - ("Open Recent Notebook", gtk.STOCK_OPEN, - _("Open Re_cent Notebook")), - - ("Reload Notebook", gtk.STOCK_REVERT_TO_SAVED, - _("_Reload Notebook"), - "", _("Reload the current notebook"), - lambda w: self.reload_notebook()), - - ("Save Notebook", gtk.STOCK_SAVE, _("_Save Notebook"), - "S", _("Save the current notebook"), - lambda w: self._app.save()), - - ("Close Notebook", gtk.STOCK_CLOSE, _("_Close Notebook"), - "", _("Close the current notebook"), - lambda w: self._app.close_all_notebook(self.get_notebook())), - - ("Empty Trash", gtk.STOCK_DELETE, _("Empty _Trash"), - "", None, - lambda w: self.on_empty_trash()), - - ("Export", None, _("_Export Notebook")), - - ("Import", None, _("_Import Notebook")), - - ("Quit", gtk.STOCK_QUIT, _("_Quit"), - "Q", _("Quit KeepNote"), - lambda w: self.on_quit()), - - #======================================= - ("Edit", None, _("_Edit")), - - ("Undo", gtk.STOCK_UNDO, None, - "Z", None, - lambda w: self.on_undo()), - - ("Redo", gtk.STOCK_REDO, None, - "Z", None, - lambda w: self.on_redo()), - - ("Cut", gtk.STOCK_CUT, None, - "X", None, - lambda w: self.on_cut()), - - ("Copy", gtk.STOCK_COPY, None, - "C", None, - lambda w: self.on_copy()), - - ("Copy Tree", gtk.STOCK_COPY, None, - "C", None, - lambda w: self.on_copy_tree()), - - ("Paste", gtk.STOCK_PASTE, None, - "V", None, - lambda w: self.on_paste()), - - ("KeepNote Preferences", gtk.STOCK_PREFERENCES, - _("_Preferences"), - "", None, - lambda w: self._app.app_options_dialog.show(self)), - - #======================================== - ("Search", None, _("_Search")), - - ("Search All Notes", gtk.STOCK_FIND, _("_Search All Notes"), - "K", None, - lambda w: self.search_box.grab_focus()), - - #======================================= - ("Go", None, _("_Go")), - - #======================================== - ("View", None, _("_View")), - - ("View Note As", gtk.STOCK_OPEN, _("_View Note As")), - - ("View Note in File Explorer", gtk.STOCK_OPEN, - _("View Note in File Explorer"), - "", None, - lambda w: self.on_view_node_external_app("file_explorer", - kind="dir")), - - ("View Note in Text Editor", gtk.STOCK_OPEN, - _("View Note in Text Editor"), - "", None, - lambda w: self.on_view_node_external_app("text_editor", - kind="page")), - - ("View Note in Web Browser", gtk.STOCK_OPEN, - _("View Note in Web Browser"), - "", None, - lambda w: self.on_view_node_external_app("web_browser", - kind="page")), - - ("Open File", gtk.STOCK_OPEN, - _("_Open File"), - "", None, - lambda w: self.on_view_node_external_app("file_launcher", - kind="file")), - - #========================================= - ("Tools", None, _("_Tools")), - - ("Update Notebook Index", None, _("_Update Notebook Index"), - "", None, - lambda w: self.update_index(clear=True)), - - ("Compact Notebook Index", None, _("_Compact Notebook Index"), - "", None, - lambda w: self.compact_index()), - - ("Open Notebook URL", None, _("_Open Notebook from URL"), - "", None, - lambda w: self.on_open_notebook_url()), - - #========================================= - ("Window", None, _("Window")), - - ("New Window", None, _("New Window"), - "", _("Open a new window"), - lambda w: self.on_new_window()), - - ("Close Window", None, _("Close Window"), - "", _("Close window"), - lambda w: self.close()), - - #========================================= - ("Help", None, _("_Help")), - - ("View Error Log...", gtk.STOCK_DIALOG_ERROR, - _("View _Error Log..."), - "", None, - lambda w: self.view_error_log()), - - ("View Preference Files...", None, - _("View Preference Files..."), "", None, - lambda w: self.view_config_files()), - - ("Drag and Drop Test...", None, _("Drag and Drop Test..."), - "", None, - lambda w: self.drag_test.on_drag_and_drop_test()), - - ("About", gtk.STOCK_ABOUT, _("_About"), - "", None, - lambda w: self.on_about()) - ]) + [ - - Action("Main Spacer Tool"), - Action("Search Box Tool", None, None, "", _("Search All Notes")), - Action("Search Button Tool", gtk.STOCK_FIND, None, "", - _("Search All Notes"), - lambda w: self.search_box.on_search_nodes())] - - # make sure recent notebooks is always visible - recent = [x for x in actions - if x.get_property("name") == "Open Recent Notebook"][0] - recent.set_property("is-important", True) - - return actions - - def setup_menus(self, uimanager): - pass - - def get_ui(self): - return [""" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"""] - - def get_actions_statusicon(self): - """Set actions for StatusIcon menu and return.""" - actions = map( - lambda x: Action(*x), - [("KeepNote Preferences", gtk.STOCK_PREFERENCES, - _("_Preferences"), - "", None, - lambda w: self._app.app_options_dialog.show(self)), - ("Quit", gtk.STOCK_QUIT, _("_Quit"), - "Q", _("Quit KeepNote"), - lambda w: self.close()), - ("About", gtk.STOCK_ABOUT, _("_About"), - "", None, - lambda w: self.on_about()) - ]) - - return actions - - def get_ui_statusicon(self): - """Create UI xml-definition for StatusIcon menu and return.""" - return [""" - - - - - - - - - -"""] - def make_menubar(self): - """Initialize the menu bar""" - - #=============================== - # ui manager - - self._actiongroup = gtk.ActionGroup('MainWindow') - self._uimanager.insert_action_group(self._actiongroup, 0) - - # setup menus - add_actions(self._actiongroup, self.get_actions()) - for s in self.get_ui(): - self._uimanager.add_ui_from_string(s) - self.setup_menus(self._uimanager) - - # return menu bar - menubar = self._uimanager.get_widget('/main_menu_bar') - - return menubar + menubar_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) + + # 添加 menu_button + self.menu_button = Gtk.MenuButton(label="Menu") + self._widgets["menu_button"] = self.menu_button + menubar_box.append(self.menu_button) + + # 创建并插入动作组 + self.win_actions = Gio.SimpleActionGroup() + self.insert_action_group("win", self.win_actions) + + def create_menu_button(title, actions): + menu = Gio.Menu() + for label, action_name, callback in actions: + menu.append(label, f"win.{action_name}") + if not self.win_actions.has_action(action_name): + action = Gio.SimpleAction.new(action_name, None) + action.connect("activate", lambda a, p, cb=callback: cb()) + self.win_actions.add_action(action) + btn = Gtk.MenuButton(label=title) + btn.set_popover(Gtk.PopoverMenu.new_from_model(menu)) + return btn + + # 文件菜单 + file_actions = [ + ("New Notebook", "new_notebook", self.on_new_notebook), + ("Open Notebook", "open_notebook", self.on_open_notebook), + ("Save Notebook", "save_notebook", lambda: self.save_notebook(silent=False)), + ("Close Notebook", "close_notebook", lambda: self._app.close_all_notebook(self.get_notebook())), + ("Reload Notebook", "reload_notebook", self.reload_notebook), + ("Empty Trash", "empty_trash", self.on_empty_trash), + ("Quit", "quit", self.on_quit), + ] + menubar_box.append(create_menu_button("File", file_actions)) + + # 编辑菜单 + edit_actions = [ + ("Undo", "undo", self.on_undo), + ("Redo", "redo", self.on_redo), + ("Cut", "cut", self.on_cut), + ("Copy", "copy", self.on_copy), + ("Copy Tree", "copy_tree", self.on_copy_tree), + ("Paste", "paste", self.on_paste), + ] + menubar_box.append(create_menu_button("Edit", edit_actions)) + + # 搜索菜单 + search_actions = [ + ("Search All Notes", "search_all", + lambda: self.search_box.grab_focus() if hasattr(self, 'search_box') else None), + ] + menubar_box.append(create_menu_button("Search", search_actions)) + + # 工具菜单 + tools_actions = [ + ("Update Notebook Index", "update_index", lambda: self.update_index(clear=True)), + ("Compact Notebook Index", "compact_index", self.compact_index), + ("Open Notebook from URL", "open_url", self.on_open_notebook_url), + ] + menubar_box.append(create_menu_button("Tools", tools_actions)) + + # 窗口菜单 + window_actions = [ + ("New Window", "new_window", self.on_new_window), + ("Close Window", "close_window", self.close), + ] + menubar_box.append(create_menu_button("Window", window_actions)) + + # 帮助菜单 + help_actions = [ + ("View Error Log", "error_log", self.view_error_log), + ("View Preference Files", "pref_files", self.view_config_files), + ("Drag and Drop Test", "drag_drop_test", lambda: self.drag_test.on_drag_and_drop_test()), + ("About", "about", self.on_about), + ] + menubar_box.append(create_menu_button("Help", help_actions)) + + return menubar_box def make_toolbar(self): + toolbar = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) + toolbar.set_margin_start(0) + toolbar.set_margin_end(0) + toolbar.set_margin_top(0) + toolbar.set_margin_bottom(0) - # configure toolbar - toolbar = self._uimanager.get_widget('/main_tool_bar') - toolbar.set_orientation(gtk.ORIENTATION_HORIZONTAL) - toolbar.set_style(gtk.TOOLBAR_ICONS) - toolbar.set_border_width(0) - - try: - # NOTE: if this version of GTK doesn't have this size, then - # ignore it - toolbar.set_property("icon-size", gtk.ICON_SIZE_SMALL_TOOLBAR) - except: - pass - - # separator (is there a better way to do this?) - spacer = self._uimanager.get_widget("/main_tool_bar/Main Spacer Tool") - spacer.remove(spacer.child) - spacer.set_expand(True) - - # search box self.search_box = SearchBox(self) - self.search_box.show() - w = self._uimanager.get_widget("/main_tool_bar/Search Box Tool") - w.remove(w.child) - w.add(self.search_box) - - return toolbar - - def make_statusicon_menu(self): - """Initialize the StatusIcon menu.""" - - #=============================== - # ui manager - - self._actiongroup_statusicon = gtk.ActionGroup('StatusIcon') - self._tray_icon.uimanager = gtk.UIManager() - self._tray_icon.uimanager.insert_action_group( - self._actiongroup_statusicon, 0) + toolbar.append(self.search_box) - # setup menu - add_actions(self._actiongroup_statusicon, - self.get_actions_statusicon()) - for s in self.get_ui_statusicon(): - self._tray_icon.uimanager.add_ui_from_string(s) - self.setup_menus(self._tray_icon.uimanager) - - # return menu - statusicon_menu = self._tray_icon.uimanager.get_widget( - '/statusicon_menu') - - return statusicon_menu + search_button = Gtk.Button(label=_("Search")) + search_button.connect("clicked", lambda w: self.search_box.on_search_nodes()) + toolbar.append(search_button) + # Call recent menu setup here to ensure file_menu_model is initialized + if hasattr(self, '_recent_notebooks'): + self.set_recent_notebooks_menu(self._recent_notebooks) + return toolbar -gobject.type_register(KeepNoteWindow) -gobject.signal_new("error", KeepNoteWindow, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str, object, object)) -class SearchBox (gtk.Entry): +class SearchBox(Gtk.Entry): def __init__(self, window): - gtk.Entry.__init__(self) + super().__init__() self._window = window - self.connect("changed", self._on_search_box_text_changed) self.connect("activate", lambda w: self.on_search_nodes()) - self.search_box_list = gtk.ListStore(gobject.TYPE_STRING, - gobject.TYPE_STRING) - self.search_box_completion = gtk.EntryCompletion() - self.search_box_completion.connect( - "match-selected", self._on_search_box_completion_match) - self.search_box_completion.set_match_func(lambda c, k, i: True) + self.search_box_list = Gtk.ListStore.new([str, str]) + self.search_box_completion = Gtk.EntryCompletion() + self.search_box_completion.connect("match-selected", self._on_search_box_completion_match) + self.search_box_completion.set_match_func(lambda c, k, i: True, None) self.search_box_completion.set_model(self.search_box_list) self.search_box_completion.set_text_column(0) self.set_completion(self.search_box_completion) def on_search_nodes(self): - """Search nodes""" - - # do nothing if notebook is not defined if not self._window.get_notebook(): return - # TODO: add parsing grammar - # get words - words = [x.lower() for x in - unicode_gtk(self.get_text()).strip().split()] - - # clear listview + words = [x.lower() for x in unicode_gtk(self.get_text()).strip().split()] self._window.get_viewer().start_search_result() - # queue for sending results between threads from threading import Lock - from Queue import Queue + from queue import Queue queue = Queue() - lock = Lock() # a mutex for the notebook (protect sqlite) + lock = Lock() - # update gui with search result def search(task): - alldone = Lock() # ensure gui and background sync up at end + alldone = Lock() alldone.acquire() def gui_update(): lock.acquire() more = True - try: maxstep = 20 - for i in xrange(maxstep): - # check if search is aborted + for _ in range(maxstep): if task.aborted(): more = False break - - # skip if queue is empty if queue.empty(): break node = queue.get() - - # no more nodes left, finish if node is None: more = False break - - # add result to gui self._window.get_viewer().add_search_result(node) - - except Exception, e: + except Exception as e: self._window.error(_("Unexpected error"), e) more = False finally: lock.release() - if not more: alldone.release() return more - gobject.idle_add(gui_update) + GLib.idle_add(gui_update) - # init search notebook = self._window.get_notebook() try: - nodes = (notebook.get_node_by_id(nodeid) - for nodeid in - notebook.search_node_contents(" ".join(words)) - if nodeid) + nodes = (notebook.get_node_by_id(nodeid) for nodeid in notebook.search_node_contents(" ".join(words)) if nodeid) except: keepnote.log_error() - # do search in thread try: lock.acquire() for node in nodes: @@ -1555,19 +1024,14 @@ def gui_update(): lock.acquire() lock.release() queue.put(None) - except Exception, e: + except Exception as e: self.error(_("Unexpected error"), e) - # wait for gui thread to finish - # NOTE: if task is aborted, then gui_update stops itself for - # some reason, thus no need to acquire alldone. if not task.aborted(): alldone.acquire() - # launch task task = tasklib.Task(search) - self._window.wait_dialog( - _("Searching notebook"), _("Searching..."), task) + self._window.wait_dialog(_("Searching notebook"), _("Searching..."), task) if task.exc_info()[0]: e, t, tr = task.exc_info() keepnote.log_error(e, tr) @@ -1575,33 +1039,25 @@ def gui_update(): self._window.get_viewer().end_search_result() def focus_on_search_box(self): - """Place cursor in search box""" self.grab_focus() - def _on_search_box_text_changed(self, url_text): - + def _on_search_box_text_changed(self, entry): self.search_box_update_completion() def search_box_update_completion(self): - if not self._window.get_notebook(): return - text = unicode_gtk(self.get_text()) - self.search_box_list.clear() - if len(text) > 0: + if text: results = self._window.get_notebook().search_node_titles(text)[:10] for nodeid, title in results: self.search_box_list.append([title, nodeid]) - def _on_search_box_completion_match(self, completion, model, iter): - + def _on_search_box_completion_match(self, completion, model, iter_): if not self._window.get_notebook(): return - - nodeid = model[iter][1] - + nodeid = model[iter_][1] node = self._window.get_notebook().get_node_by_id(nodeid) if node: - self._window.get_viewer().goto_node(node, False) + self._window.get_viewer().goto_node(node, False) \ No newline at end of file diff --git a/keepnote/gui/popupwindow.py b/keepnote/gui/popupwindow.py index fb47f4bf6..033feacbf 100644 --- a/keepnote/gui/popupwindow.py +++ b/keepnote/gui/popupwindow.py @@ -1,26 +1,23 @@ +# PyGObject imports +from gi import require_version +require_version('Gtk', '4.0') +from gi.repository import Gtk, Gdk -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk - - -class PopupWindow (gtk.Window): +class PopupWindow(Gtk.Window): """A customizable popup window""" def __init__(self, parent): - gtk.Window.__init__(self, gtk.WINDOW_POPUP) - self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_MENU) + super().__init__(type_hint=Gdk.SurfaceTypeHint.MENU) # Replaces WindowType.POPUP and set_type_hint self.set_transient_for(parent.get_toplevel()) - self.set_flags(gtk.CAN_FOCUS) - self.add_events(gtk.gdk.KEY_PRESS_MASK | - gtk.gdk.KEY_RELEASE_MASK) + self.set_can_focus(True) + self.add_events(Gdk.EventMask.KEY_PRESS_MASK | + Gdk.EventMask.KEY_RELEASE_MASK) self._parent = parent self._parent.get_toplevel().connect("configure-event", self._on_configure_event) - # coordinates of popup + # Coordinates of popup self._x = 0 self._y = 0 self._y2 = 0 @@ -31,36 +28,61 @@ def _on_configure_event(self, widget, event): def move_on_parent(self, x, y, y2): """Move popup relative to parent widget""" - win = self._parent.get_parent_window() + win = self._parent.get_parent_surface() # Replaces get_parent_window if win is None: return - # remember coordinates + # Remember coordinates self._x = x self._y = y self._y2 = y2 - # get screen dimensions - screenh = gtk.gdk.screen_height() + # Get screen dimensions + display = self.get_display() + monitor = display.get_monitor_at_surface(win) + geometry = monitor.get_geometry() + screenh = geometry.height # Replaces screen.get_height() - # account for window - wx, wy = win.get_origin() - x3 = wx - y3 = wy + # Account for window + wx, wy = win.get_position() # Replaces get_origin() - # account for widget + # Account for widget rect = self._parent.get_allocation() - x3 += rect.x - y3 += rect.y + x3 = wx + rect.x + y3 = wy + rect.y - # get size of popup - w, h = self.child.size_request() - self.resize(w, h) + # Get size of popup + child = self.get_child() + if child: + # In GTK 4, get_preferred_size() is replaced with measure() + child.measure(Gtk.Orientation.HORIZONTAL, -1) + child.measure(Gtk.Orientation.VERTICAL, -1) + w = child.get_width() # Simplified for now + h = child.get_height() # Simplified for now + self.set_default_size(w, h) # Replaces resize() - # perform move + # Perform move if y + y3 + h < screenh: - # drop down - self.move(x + x3, y + y3) + # Drop down + self.set_position(x + x3, y + y3) # Replaces move() else: - # drop up - self.move(x + x3, y2 + y3 - h) + # Drop up + self.set_position(x + x3, y2 + y3 - h) # Replaces move() + + def set_position(self, x, y): + """Set the position of the window""" + # In GTK 4, move() is replaced with manual positioning + self.set_default_position(x, y) # Custom method to store position + if self.get_realized(): + self.get_surface().move(x, y) + + def set_default_position(self, x, y): + """Store the default position for unrealized windows""" + self._default_x = x + self._default_y = y + + def realize(self): + """Override realize to set position after realization""" + super().realize() + if hasattr(self, '_default_x') and hasattr(self, '_default_y'): + self.get_surface().move(self._default_x, self._default_y) \ No newline at end of file diff --git a/keepnote/gui/richtext/__init__.py b/keepnote/gui/richtext/__init__.py index be427f517..6287553e0 100644 --- a/keepnote/gui/richtext/__init__.py +++ b/keepnote/gui/richtext/__init__.py @@ -1,66 +1,29 @@ -""" - - KeepNote - General rich text editor that saves to HTML - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python imports import codecs from itertools import chain import os import re import random -import StringIO -import urlparse +import io +import urllib.parse import uuid from xml.sax.saxutils import escape +import gi +from gi.repository import GdkPixbuf +from gi.repository import GObject # Added for signal registration -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gobject -import pango -from gtk import gdk -import gtk.keysyms # this is necessary for py2exe discovery - -# try to import spell check -try: - import gtkspell -except ImportError: - gtkspell = None - -# textbuffer_tools imports +gi.require_version('Gtk', '4.0') +# PyGObject imports (GTK 4) +from gi.repository import Gtk, Gdk, Pango + +# Textbuffer_tools imports from .textbuffer_tools import \ iter_buffer_contents, iter_buffer_anchors, sanitize_text -# richtextbuffer imports -from .richtextbuffer import \ - ignore_tag, \ - RichTextBuffer, \ - RichTextImage +# Richtextbuffer imports +from .richtextbuffer import ignore_tag, RichTextBuffer, RichTextImage -# tag imports +# Tag imports from .richtext_tags import \ RichTextModTag, \ RichTextJustifyTag, \ @@ -73,56 +36,36 @@ RichTextLinkTag, \ get_text_scale -# pyflakes ignore +# Pyflakes ignore RichTextBulletTag RichTextIndentTag -# richtext io +# Richtext IO from .richtext_html import HtmlBuffer, HtmlError -import keepnote -from keepnote import translate as _ - +# +from keepnote.util.platform import get_platform -#============================================================================= -# constants +# Constants DEFAULT_FONT = "Sans 10" TEXTVIEW_MARGIN = 5 -if keepnote.get_platform() == "darwin": - CLIPBOARD_NAME = gdk.SELECTION_PRIMARY +if get_platform() == "darwin": + CLIPBOARD_NAME = "primary" else: - CLIPBOARD_NAME = "CLIPBOARD" -RICHTEXT_ID = -3 # application defined integer for the clipboard + CLIPBOARD_NAME = "clipboard" +RICHTEXT_ID = -3 # Application-defined integer for the clipboard CONTEXT_MENU_ACCEL_PATH = "
/richtext_context_menu" -QUOTE_FORMAT = u'from %t:
%s' +QUOTE_FORMAT = 'from %t:
%s' -# mime types -# richtext mime type is process specific +# MIME types MIME_RICHTEXT = "application/x-richtext" + str(random.randint(1, 100000)) -MIME_IMAGES = ["image/png", - "image/bmp", - "image/jpeg", - "image/xpm", - - # Mac OS X MIME types - "public.png", - "public.bmp", - "public.jpeg", - "public.xpm"] - -# TODO: add more text MIME types? -MIME_TEXT = ["text/plain", - "text/plain;charset=utf-8", - "text/plain;charset=UTF-8", - "UTF8_STRING", - "STRING", - "COMPOUND_TEXT", - "TEXT"] - -MIME_HTML = ["HTML Format", - "text/html"] - -# globals +MIME_IMAGES = ["image/png", "image/bmp", "image/jpeg", "image/xpm", + "public.png", "public.bmp", "public.jpeg", "public.xpm"] +MIME_TEXT = ["text/plain", "text/plain;charset=utf-8", "text/plain;charset=UTF-8", + "UTF8_STRING", "STRING", "COMPOUND_TEXT", "TEXT"] +MIME_HTML = ["text/html"] + +# Globals _g_clipboard_contents = None @@ -131,25 +74,21 @@ def parse_font(fontstr): tokens = fontstr.split(" ") size = int(tokens.pop()) mods = [] - - # NOTE: underline is not part of the font string and is handled separately while tokens[-1] in ["Bold", "Italic"]: mods.append(tokens.pop().lower()) - return " ".join(tokens), mods, size def parse_utf(text): - - # TODO: lookup the standard way to do this - - if (text[:2] in (codecs.BOM_UTF16_BE, codecs.BOM_UTF16_LE) or - (len(text) > 1 and text[1] == '\x00') or - (len(text) > 3 and text[3] == '\x00')): - return text.decode("utf16") - else: - text = text.replace("\x00", "") - return unicode(text, "utf8") + if isinstance(text, bytes): + if (text[:2] in (codecs.BOM_UTF16_BE, codecs.BOM_UTF16_LE) or + (len(text) > 1 and text[1] == 0) or + (len(text) > 3 and text[3] == 0)): + return text.decode("utf16") + else: + text = text.replace(b"\x00", b"") + return text.decode("utf8") + return text def parse_ie_html_format(text): @@ -158,7 +97,7 @@ def parse_ie_html_format(text): if index == -1: return None index = text.find(">", index) - return text[index+1:] + return text[index + 1:] def parse_ie_html_format_headers(text): @@ -170,7 +109,7 @@ def parse_ie_html_format_headers(text): if i == -1: break key = line[:i] - val = line[i+1:] + val = line[i + 1:] headers[key] = val return headers @@ -180,7 +119,7 @@ def parse_richtext_headers(text): for line in text.splitlines(): i = line.find(":") if i > -1: - headers[line[:i]] = line[i+1:] + headers[line[:i]] = line[i + 1:] return headers @@ -198,53 +137,49 @@ def replace_vars(text, values): textlen = len(text) out = [] i = 0 - while i < textlen: if text[i] == "\\" and i < textlen - 1: - # escape - out.append(text[i+1]) + out.append(text[i + 1]) i += 2 - elif text[i] == "%" and i < textlen - 1: - # variable - varname = text[i:i+2] + varname = text[i:i + 2] out.append(values.get(varname, "")) i += 2 - else: - # literal out.append(text[i]) i += 1 - return "".join(out) -#============================================================================= - - -class RichTextError (StandardError): - """Class for errors with RichText""" - - # NOTE: this is only used for saving and loading in textview - # should this stay here? - +# Exceptions +class RichTextError(Exception): def __init__(self, msg, error): - StandardError.__init__(self, msg) + super().__init__(msg) self.msg = msg self.error = error def __str__(self): - if self.error: - return str(self.error) + "\n" + self.msg - else: - return self.msg + return f"{self.error}\n{self.msg}" if self.error else self.msg -class RichTextMenu (gtk.Menu): +class RichTextMenu(Gtk.PopoverMenu): """A popup menu for child widgets in a RichTextView""" - def __inti__(self): - gtk.Menu.__init__(self) + + def __init__(self): + super().__init__() self._child = None + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + self.set_child(menu_box) + + # Add menu items + for label, callback in [ + ("Cut", lambda w: self._textview.emit("cut-clipboard")), + ("Copy", lambda w: self._textview.emit("copy-clipboard")), + ("Delete", self._on_delete), + ]: + item = Gtk.Button(label=label) + item.connect("clicked", callback) + menu_box.append(item) def set_child(self, child): self._child = child @@ -252,28 +187,25 @@ def set_child(self, child): def get_child(self): return self._child + def set_textview(self, textview): + self._textview = textview + + def _on_delete(self, widget): + if self._textview and self._textview._textbuffer: + self._textview._textbuffer.delete_selection(True, True) -class RichTextIO (object): + +class RichTextIO(object): """Read/Writes the contents of a RichTextBuffer to disk""" def __init__(self): self._html_buffer = HtmlBuffer() def save(self, textbuffer, filename, title=None, stream=None): - """ - Save buffer contents to file - - textbuffer -- richtextbuffer to save - filename -- HTML filename to save to (optional if stream given) - title -- title of HTML file (optional) - stream -- output stream for HTML file (optional) - """ self._save_images(textbuffer, filename) - try: buffer_contents = iter_buffer_contents( textbuffer, None, None, ignore_tag) - if stream: out = stream else: @@ -283,29 +215,17 @@ def save(self, textbuffer, filename, title=None, stream=None): textbuffer.tag_table, title=title) out.close() - except IOError, e: - raise RichTextError("Could not save '%s'." % filename, e) - + except IOError as e: + raise RichTextError(f"Could not save '{filename}'.", e) textbuffer.set_modified(False) def load(self, textview, textbuffer, filename, stream=None): - """ - Load buffer with data from file - - textbuffer -- richtextbuffer to load - filename -- HTML filename to load (optional if stream given) - stream -- output stream for HTML file (optional) - """ - # unhook expensive callbacks textbuffer.block_signals() if textview: spell = textview.is_spell_check_enabled() textview.enable_spell_check(False) textview.set_buffer(None) - - # clear buffer textbuffer.clear() - err = None try: if stream: @@ -316,46 +236,33 @@ def load(self, textview, textbuffer, filename, stream=None): textbuffer.insert_contents(buffer_contents, textbuffer.get_start_iter()) infile.close() - - # put cursor at begining textbuffer.place_cursor(textbuffer.get_start_iter()) - - except (HtmlError, IOError, Exception), e: + except (HtmlError, IOError, Exception) as e: err = e textbuffer.clear() if textview: textview.set_buffer(textbuffer) ret = False else: - # finish loading self._load_images(textbuffer, filename) if textview: textview.set_buffer(textbuffer) - textview.show_all() ret = True - - # rehook up callbacks textbuffer.unblock_signals() if textview: textview.enable_spell_check(spell) textview.enable() - textbuffer.set_modified(False) - - # reraise error if not ret: - raise RichTextError("Error loading '%s'." % filename, err) + raise RichTextError(f"Error loading '{filename}'.", err) def _load_images(self, textbuffer, html_filename): - """Load images present in textbuffer""" for kind, it, param in iter_buffer_anchors(textbuffer, None, None): child, widgets = param if isinstance(child, RichTextImage): self._load_image(textbuffer, child, html_filename) def _save_images(self, textbuffer, html_filename): - """Save images present in text buffer""" - for kind, it, param in iter_buffer_anchors(textbuffer, None, None): child, widgets = param if isinstance(child, RichTextImage): @@ -377,7 +284,7 @@ def _get_filename(self, html_filename, filename): return filename -class RichTextDragDrop (object): +class RichTextDragDrop(object): """Manages drag and drop events for a richtext editor""" def __init__(self, targets=[]): @@ -391,23 +298,27 @@ def extend_targets(self, targets): self._acceptable_targets.extend(targets) def find_acceptable_target(self, targets): - for target in self._acceptable_targets: if target in targets: return target return None -class RichTextView (gtk.TextView): +class RichTextView(Gtk.TextView, GObject.GObject): """A RichText editor widget""" + __gsignals__ = { + "font-change": (GObject.SIGNAL_RUN_FIRST, None, (str,)), # Signal name, flags, return type, (param types) + "visit-url": (GObject.SIGNAL_RUN_FIRST, None, (str,)), + "child-activated": (GObject.SIGNAL_RUN_FIRST, None, (object,)), + "modified": (GObject.SIGNAL_RUN_FIRST, None, (bool,)), + } def __init__(self, textbuffer=None): - gtk.TextView.__init__(self, textbuffer) - + Gtk.TextView.__init__(self) # Initialize Gtk.TextView + GObject.GObject.__init__(self) # Initialize GObject self._textbuffer = None self._buffer_callbacks = [] self._blank_buffer = RichTextBuffer() - self._popup_menu = None self._html_buffer = HtmlBuffer() self._accel_group = None self._accel_path = CONTEXT_MENU_ACCEL_PATH @@ -423,103 +334,101 @@ def __init__(self, textbuffer=None): self.set_default_font(DEFAULT_FONT) - # spell checker + # Spell checker (disabled for now) self._spell_checker = None - self.enable_spell_check(True) - - # signals - self.set_wrap_mode(gtk.WRAP_WORD) - self.set_property("right-margin", TEXTVIEW_MARGIN) - self.set_property("left-margin", TEXTVIEW_MARGIN) + self.enable_spell_check(False) + + # Signals and properties + self.set_wrap_mode(Gtk.WrapMode.WORD) + self.set_right_margin(TEXTVIEW_MARGIN) + self.set_left_margin(TEXTVIEW_MARGIN) + + # Key event controller + key_controller = Gtk.EventControllerKey.new() + key_controller.connect("key-pressed", self.on_key_press_event) + self.add_controller(key_controller) + + # Click event controller for double-click + click_controller = Gtk.GestureClick.new() + click_controller.set_button(1) # Left click + click_controller.connect("pressed", self.on_button_press) + self.add_controller(click_controller) + + # Context menu controller (replacing populate-popup) + right_click_controller = Gtk.GestureClick.new() + right_click_controller.set_button(3) # Right click + right_click_controller.connect("pressed", self.on_right_click) + self.add_controller(right_click_controller) - self.connect("key-press-event", self.on_key_press_event) - #self.connect("insert-at-cursor", self.on_insert_at_cursor) self.connect("backspace", self.on_backspace) - self.connect("button-press-event", self.on_button_press) - # drag and drop - self.connect("drag-data-received", self.on_drag_data_received) - self.connect("drag-motion", self.on_drag_motion) - self.connect("drag-data-get", self.on_drag_data_get) - self.drag_dest_add_image_targets() + # Drag and drop (text and images) + text_drop = Gtk.DropTarget.new(str, Gdk.DragAction.COPY) + text_drop.connect("drop", self.on_drop_text) + text_drop.connect("motion", self.on_drag_motion) + self.add_controller(text_drop) - # clipboard + image_drop = Gtk.DropTarget.new(GdkPixbuf.Pixbuf, Gdk.DragAction.COPY) + image_drop.connect("drop", self.on_drop_image) + image_drop.connect("motion", self.on_drag_motion) + self.add_controller(image_drop) + + # Clipboard self.connect("copy-clipboard", lambda w: self._on_copy()) self.connect("cut-clipboard", lambda w: self._on_cut()) self.connect("paste-clipboard", lambda w: self._on_paste()) - #self.connect("button-press-event", self.on_button_press) - self.connect("populate-popup", self.on_popup) - - # popup menus - self.init_menus() - - # requires new pygtk - #self._textbuffer.register_serialize_format(MIME_TAKENOTE, - # self.serialize, None) - #self._textbuffer.register_deserialize_format(MIME_TAKENOTE, - # self.deserialize, None) - - def init_menus(self): - """Initialize popup menus""" - - # image menu + # Popup menus self._image_menu = RichTextMenu() - self._image_menu.attach_to_widget(self, lambda w, m: None) - - item = gtk.ImageMenuItem(gtk.STOCK_CUT) - item.connect("activate", lambda w: self.emit("cut-clipboard")) - self._image_menu.append(item) - item.show() - - item = gtk.ImageMenuItem(gtk.STOCK_COPY) - item.connect("activate", lambda w: self.emit("copy-clipboard")) - self._image_menu.append(item) - item.show() - - item = gtk.ImageMenuItem(gtk.STOCK_DELETE) - - def func(widget): - if self._textbuffer: - self._textbuffer.delete_selection(True, True) - item.connect("activate", func) - self._image_menu.append(item) - item.show() + self._image_menu.set_textview(self) # Pass reference to self + self._image_menu.set_parent(self) # Parent to RichTextView + self._context_menu = None + self.init_context_menu() + + def init_context_menu(self): + from keepnote import translate as _ + """Initialize the custom context menu""" + self._context_menu = Gtk.PopoverMenu() + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + self._context_menu.set_child(menu_box) + + for label, callback in [ + (_("Paste As Plain Text"), lambda w: self.paste_clipboard_as_text()), + (_("Paste As Quote"), lambda w: self.paste_clipboard_as_quote()), + (_("Paste As Plain Text Quote"), lambda w: self.paste_clipboard_as_quote(plain_text=True)), + ]: + item = Gtk.Button(label=label) + item.connect("clicked", callback) + menu_box.append(item) + + self._context_menu.set_parent(self) def set_buffer(self, textbuffer): - """Attach this textview to a RichTextBuffer""" - # tell current buffer we are detached if self._textbuffer: for callback in self._buffer_callbacks: self._textbuffer.disconnect(callback) - - # change buffer if textbuffer: - gtk.TextView.set_buffer(self, textbuffer) + if isinstance(textbuffer, RichTextBuffer): + textbuffer = textbuffer.get_buffer() + super().set_buffer(textbuffer) else: - gtk.TextView.set_buffer(self, self._blank_buffer) + super().set_buffer(self._blank_buffer) self._textbuffer = textbuffer - - # tell new buffer we are attached if self._textbuffer: - self._textbuffer.set_default_attr(self.get_default_attributes()) - self._modified_id = self._textbuffer.connect( - "modified-changed", self._on_modified_changed) - - self._buffer_callbacks = [ - self._textbuffer.connect("font-change", - self._on_font_change), - self._textbuffer.connect("child-added", - self._on_child_added), - self._textbuffer.connect("child-activated", - self._on_child_activated), - self._textbuffer.connect("child-menu", - self._on_child_popup_menu), - self._modified_id - ] - - # add all deferred anchors - self._textbuffer.add_deferred_anchors(self) + self._modified_id = self._textbuffer.connect("modified-changed", self._on_modified_changed) + self._buffer_callbacks = [] + # ✅ 如果 textbuffer 是 RichTextBuffer，才连接 font-change 信号 + # 只在 RichTextBuffer 上连接自定义信号 + if isinstance(textbuffer, RichTextBuffer): + textbuffer.add_deferred_anchors(self) + self._buffer_callbacks.append(textbuffer.connect("font-change", self._on_font_change)) + self._buffer_callbacks.append(textbuffer.connect("child-added", self._on_child_added)) + self._buffer_callbacks.append(textbuffer.connect("child-activated", self._on_child_activated)) + self._buffer_callbacks.append(textbuffer.connect("child-menu", self._on_child_popup_menu)) + # modified-changed 始终存在 + self._buffer_callbacks.append(self._modified_id) + if isinstance(textbuffer, RichTextBuffer): + textbuffer.add_deferred_anchors(self) def set_accel_group(self, accel_group): self._accel_group = accel_group @@ -534,383 +443,170 @@ def set_current_url(self, url, title=""): def get_current_url(self): return self._current_url - #====================================================== - # keyboard callbacks - - def on_key_press_event(self, textview, event): - """Callback from key press event""" - + # Keyboard callbacks + def on_key_press_event(self, controller, keyval, keycode, state): if self._textbuffer is None: - return - - if event.keyval == gtk.keysyms.ISO_Left_Tab: - # shift+tab is pressed - it = self._textbuffer.get_iter_at_mark( - self._textbuffer.get_insert()) - - # indent if there is a selection + return False + if keyval == Gdk.KEY_ISO_Left_Tab: if self._textbuffer.get_selection_bounds(): - # tab at start of line should do unindentation self.unindent() return True - - if event.keyval == gtk.keysyms.Tab: - # tab is pressed - it = self._textbuffer.get_iter_at_mark( - self._textbuffer.get_insert()) - - # indent if cursor at start of paragraph or if there is a selection - if self._textbuffer.starts_par(it) or \ - self._textbuffer.get_selection_bounds(): - # tab at start of line should do indentation + if keyval == Gdk.KEY_Tab: + it = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) + if self._textbuffer.starts_par(it) or self._textbuffer.get_selection_bounds(): self.indent() return True - - if event.keyval == gtk.keysyms.Delete: - # delete key pressed - - # TODO: make sure selection with delete does not fracture - # unedititable regions. - it = self._textbuffer.get_iter_at_mark( - self._textbuffer.get_insert()) - - if not self._textbuffer.get_selection_bounds() and \ - self._textbuffer.starts_par(it) and \ - not self._textbuffer.is_insert_allowed(it) and \ - self._textbuffer.get_indent(it)[0] > 0: - # delete inside bullet phrase, removes bullet + if keyval == Gdk.KEY_Delete: + it = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) + if (not self._textbuffer.get_selection_bounds() and + self._textbuffer.starts_par(it) and + not self._textbuffer.is_insert_allowed(it) and + self._textbuffer.get_indent(it)[0] > 0): self.toggle_bullet("none") self.unindent() return True + return False def on_backspace(self, textview): - """Callback for backspace press""" if not self._textbuffer: return - it = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) - if self._textbuffer.starts_par(it): - # look for indent tags indent, par_type = self._textbuffer.get_indent() if indent > 0: self.unindent() - self.stop_emission("backspace") + self.stop_emission_by_name("backspace") - #============================================== - # callbacks - - def on_button_press(self, widget, event): - """Process context popup menu""" - if event.button == 1 and event.type == gtk.gdk._2BUTTON_PRESS: - # double left click - - x, y = self.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, - int(event.x), int(event.y)) + # Click callbacks + def on_button_press(self, gesture, n_press, x, y): + if n_press == 2: # Double-click it = self.get_iter_at_location(x, y) - if self.click_iter(it): - self.stop_emission("button-press-event") + gesture.set_state(Gtk.EventSequenceState.CLAIMED) + + def on_right_click(self, gesture, n_press, x, y): + if n_press == 1: # Single right-click + self._context_menu.set_pointing_to(Gdk.Rectangle(x, y, 1, 1)) + self._context_menu.popup() + gesture.set_state(Gtk.EventSequenceState.CLAIMED) def click_iter(self, it=None): - """Perfrom click action at TextIter it""" if not self._textbuffer: - return - + return False if it is None: it = self._textbuffer.get_insert_iter() - for tag in chain(it.get_tags(), it.get_toggled_tags(False)): if isinstance(tag, RichTextLinkTag): self.emit("visit-url", tag.get_href()) return True - return False - #======================================================= # Drag and drop - - def on_drag_motion(self, textview, drag_context, x, y, timestamp): - """Callback for when dragging over textview""" + def on_drag_motion(self, controller, x, y): if not self._textbuffer: - return - - target = self.dragdrop.find_acceptable_target(drag_context.targets) - if target: - textview.drag_dest_set_target_list([(target, 0, 0)]) - - def on_drag_data_received(self, widget, drag_context, x, y, - selection_data, info, eventtime): - """Callback for when drop event is received""" + return False + target = self.dragdrop.find_acceptable_target(controller.get_formats().get_mime_types()) + return bool(target) + def on_drop_text(self, controller, value, x, y): if not self._textbuffer: - return - - #TODO: make this pluggable. - - target = self.dragdrop.find_acceptable_target(drag_context.targets) - - if target in MIME_IMAGES: - # process image drop - pixbuf = selection_data.get_pixbuf() - - if pixbuf is not None: - image = RichTextImage() - image.set_from_pixbuf(pixbuf) - - self.insert_image(image) - - drag_context.finish(True, True, eventtime) - self.stop_emission("drag-data-received") - - elif target == "text/uri-list": - # process URI drop - uris = parse_utf(selection_data.data) - - # remove empty lines and comments - uris = [xx for xx in (uri.strip() - for uri in uris.split("\n")) + return False + target = self.dragdrop.find_acceptable_target(controller.get_formats().get_mime_types()) + if target == "text/uri-list": + uris = parse_utf(value) + uris = [xx for xx in (uri.strip() for uri in uris.split("\n")) if len(xx) > 0 and xx[0] != "#"] - links = ['%s ' % (uri, uri) for uri in uris] - - # insert links self.insert_html("
".join(links)) - + return True elif target in MIME_HTML: - # process html drop - html = parse_utf(selection_data.data) - if target == "HTML Format": - # skip over headers - html = html[html.find("\r\n\r\n")+4:] - + html = parse_utf(value) self.insert_html(html) - + return True elif target in MIME_TEXT: - # process text drop - self._textbuffer.insert_at_cursor(selection_data.get_text()) - - def on_drag_data_get(self, widget, drag_context, selection_data, - info, timestamp): - """ - Callback for when data is requested by drag_get_data - """ - return - - """ - # override gtk's data get code - self.stop_emission("drag-data-get") - - sel = self._textbuffer.get_selection_bounds() - - # do nothing if nothing is selected - if not sel: - text = "" - else: - start, end = sel - text = start.get_text(end) - print "get", repr(text) - selection_data.set_text(text.encode("utf8"), -1) + self._textbuffer.insert_at_cursor(parse_utf(value)) + return True + return False - #self.emit("cut-clipboard") - """ + def on_drop_image(self, controller, value, x, y): + if not self._textbuffer: + return False + if isinstance(value, GdkPixbuf.Pixbuf): + image = RichTextImage() + image.set_from_pixbuf(value) + self.insert_image(image) + return True + return False - #================================================================== # Copy and Paste - def _on_copy(self): - """Callback for copy action""" - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - self.stop_emission('copy-clipboard') + clipboard = self.get_clipboard() + self.stop_emission_by_name('copy-clipboard') self.copy_clipboard(clipboard) def _on_cut(self): - """Callback for cut action""" - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - self.stop_emission('cut-clipboard') + clipboard = self.get_clipboard() + self.stop_emission_by_name('cut-clipboard') self.cut_clipboard(clipboard, self.get_editable()) def _on_paste(self): - """Callback for paste action""" - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - self.stop_emission('paste-clipboard') + clipboard = self.get_clipboard() + self.stop_emission_by_name('paste-clipboard') self.paste_clipboard(clipboard, None, self.get_editable()) def copy_clipboard(self, clipboard): - """Callback for copy event""" - - #clipboard.set_can_store(None) - if not self._textbuffer: return - sel = self._textbuffer.get_selection_bounds() - - # do nothing if nothing is selected if not sel: return - start, end = sel contents = list(self._textbuffer.copy_contents(start, end)) - headers = format_richtext_headers([ - ("title", self._current_title), - ("url", self._current_url)]) - - if len(contents) == 1 and \ - contents[0][0] == "anchor" and \ - isinstance(contents[0][2][0], RichTextImage): - # copy image - targets = [(MIME_RICHTEXT, gtk.TARGET_SAME_APP, RICHTEXT_ID)] + \ - [("text/x-moz-url-priv", 0, RICHTEXT_ID)] + \ - [("text/html", 0, RICHTEXT_ID)] + \ - [(x, 0, RICHTEXT_ID) for x in MIME_IMAGES] - - clipboard.set_with_data(targets, self._get_selection_data, - self._clear_selection_data, - (headers, contents, "")) - + headers = format_richtext_headers([("title", self._current_title), + ("url", self._current_url)]) + if len(contents) == 1 and contents[0][0] == "anchor" and isinstance(contents[0][2][0], RichTextImage): + clipboard.set("Image copied") else: - # copy text - targets = [(MIME_RICHTEXT, gtk.TARGET_SAME_APP, RICHTEXT_ID)] + \ - [("text/x-moz-url-priv", 0, RICHTEXT_ID)] + \ - [("text/html", 0, RICHTEXT_ID)] + \ - [(x, 0, RICHTEXT_ID) for x in MIME_TEXT] - text = start.get_text(end) - clipboard.set_with_data(targets, self._get_selection_data, - self._clear_selection_data, - (headers, contents, text)) + clipboard.set(text) def cut_clipboard(self, clipboard, default_editable): - """Callback for cut event""" if not self._textbuffer: return - self.copy_clipboard(clipboard) self._textbuffer.delete_selection(True, default_editable) def paste_clipboard(self, clipboard, override_location, default_editable): - """Callback for paste event""" - if not self._textbuffer: return - - # get available targets for paste - targets = clipboard.wait_for_targets() - if targets is None: - return - targets = set(targets) - - # check that insert is allowed it = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) if not self._textbuffer.is_insert_allowed(it): return - - # try to paste richtext - if MIME_RICHTEXT in targets: - clipboard.request_contents(MIME_RICHTEXT, self._do_paste_object) - return - - # try to paste html - for mime_html in MIME_HTML: - if mime_html in targets: - if mime_html == "HTML Format": - clipboard.request_contents(mime_html, - self._do_paste_html_headers) - else: - clipboard.request_contents(mime_html, self._do_paste_html) - return - - # try to paste image - for mime_image in MIME_IMAGES: - if mime_image in targets: - clipboard.request_contents(mime_image, self._do_paste_image) - return - - # paste plain text as last resort - clipboard.request_text(self._do_paste_text) + clipboard.read_text_async(None, self._do_paste_text) def paste_clipboard_as_text(self): - """Callback for paste action""" - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - + clipboard = self.get_clipboard() if not self._textbuffer: return - - targets = clipboard.wait_for_targets() - if targets is None: - # nothing on clipboard - return - - # check that insert is allowed it = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) if not self._textbuffer.is_insert_allowed(it): return - - # request text - clipboard.request_text(self._do_paste_text) + clipboard.read_text_async(None, self._do_paste_text) def paste_clipboard_as_quote(self, plain_text=False): - """Callback for paste action""" - clipboard = self.get_clipboard(selection=CLIPBOARD_NAME) - + clipboard = self.get_clipboard() quote_format = self._quote_format - if not self._textbuffer: return - - targets = clipboard.wait_for_targets() - if targets is None: - # nothing on clipboard - return - - # check that insert is allowed it = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) if not self._textbuffer.is_insert_allowed(it): return - - if MIME_RICHTEXT in targets: - selection_data = clipboard.wait_for_contents(MIME_RICHTEXT) - headers = parse_richtext_headers(parse_utf(selection_data.data)) - url = headers.get("url") - title = headers.get("title") - elif "text/x-moz-url-priv" in targets: - selection_data = clipboard.wait_for_contents("text/x-moz-url-priv") - url = parse_utf(selection_data.data) - url = url.strip("\n\r\0") - title = None - elif "HTML Format" in targets: - selection_data = clipboard.wait_for_contents("HTML Format") - headers = parse_ie_html_format_headers( - parse_utf(selection_data.data)) - url = headers.get("SourceURL") - title = None - else: - url = None - title = None - - # setup variables - if url is not None: - parts = urlparse.urlsplit(url) - url = url - if parts.hostname: - host = parts.hostname - else: - host = u"unknown source" - else: - url = u"" - host = u"unknown source" + url = self._current_url + title = self._current_title or "unknown source" unique = str(uuid.uuid4()) - - if title is None: - title = host - - # replace variables quote_format = replace_vars(quote_format, {"%u": escape(url), "%t": escape(title), "%s": unique}) - - # prepare quote data contents = self.parse_html(quote_format) before = [] after = [] @@ -920,14 +616,10 @@ def paste_clipboard_as_quote(self, plain_text=False): if unique in text: j = text.find(unique) before.append(("text", item[1], text[:j])) - after = [("text", item[1], text[j+len(unique):])] - after.extend(contents[i+1:]) + after = [("text", item[1], text[j + len(unique):])] + after.extend(contents[i + 1:]) break before.append(item) - - # TODO: paste is not considered a single action yet - - # perform paste of contents self._textbuffer.begin_user_action() offset1 = it.get_offset() if plain_text: @@ -936,286 +628,116 @@ def paste_clipboard_as_quote(self, plain_text=False): self.paste_clipboard(clipboard, False, True) end = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) start = self._textbuffer.get_iter_at_offset(offset1) - - # get pasted contents contents2 = list(iter_buffer_contents(self._textbuffer, start, end)) - - # repaste with quote self._textbuffer.delete(start, end) self._textbuffer.insert_contents(before) self._textbuffer.insert_contents(contents2) self._textbuffer.insert_contents(after) self._textbuffer.end_user_action() - def _do_paste_text(self, clipboard, text, data): - """Paste text into buffer""" + def _do_paste_text(self, clipboard, task): + text = clipboard.read_text_finish(task) if text is None: return - self._textbuffer.begin_user_action() self._textbuffer.delete_selection(False, True) self._textbuffer.insert_at_cursor(sanitize_text(text)) self._textbuffer.end_user_action() - - self.scroll_mark_onscreen(self._textbuffer.get_insert()) - - def _do_paste_html(self, clipboard, selection_data, data): - """Paste HTML into buffer""" - html = parse_utf(selection_data.data) - self._paste_html(html) - - def _do_paste_html_headers(self, clipboard, selection_data, data): - """Paste 'HTML Format' into buffer""" - html = parse_utf(selection_data.data) - html = parse_ie_html_format(html) - self._paste_html(html) - - def _paste_html(self, html): - """Perform paste of HTML from string""" - try: - self._textbuffer.begin_user_action() - self._textbuffer.delete_selection(False, True) - self.insert_html(html) - self._textbuffer.end_user_action() - - self.scroll_mark_onscreen(self._textbuffer.get_insert()) - except Exception: - pass - - def _do_paste_image(self, clipboard, selection_data, data): - """Paste image into buffer""" - pixbuf = selection_data.get_pixbuf() - image = RichTextImage() - image.set_from_pixbuf(pixbuf) - - self._textbuffer.begin_user_action() - self._textbuffer.delete_selection(False, True) - self._textbuffer.insert_image(image) - self._textbuffer.end_user_action() - self.scroll_mark_onscreen(self._textbuffer.get_insert()) - - def _do_paste_object(self, clipboard, selection_data, data): - """Paste a program-specific object into buffer""" - - if _g_clipboard_contents is None: - # do nothing - return - - self._textbuffer.begin_user_action() - self._textbuffer.delete_selection(False, True) - self._textbuffer.insert_contents(_g_clipboard_contents) - self._textbuffer.end_user_action() self.scroll_mark_onscreen(self._textbuffer.get_insert()) - def _get_selection_data(self, clipboard, selection_data, info, data): - """Callback for when Clipboard needs selection data""" - global _g_clipboard_contents - - headers, contents, text = data - - _g_clipboard_contents = contents - - if "text/x-moz-url-priv" in selection_data.target: - selection_data.set("text/x-moz-url-priv", 8, self._current_url) - - elif MIME_RICHTEXT in selection_data.target: - # set rich text - selection_data.set(MIME_RICHTEXT, 8, headers) - - elif "text/html" in selection_data.target: - # set html - stream = StringIO.StringIO() - self._html_buffer.set_output(stream) - self._html_buffer.write(contents, - self._textbuffer.tag_table, - partial=True, - xhtml=False) - selection_data.set("text/html", 8, stream.getvalue()) - - elif len([x for x in MIME_IMAGES - if x in selection_data.target]) > 0: - # set image - image = contents[0][2][0] - selection_data.set_pixbuf(image.get_original_pixbuf()) - - else: - # set plain text - selection_data.set_text(text) - - def _clear_selection_data(self, clipboard, data): - """Callback for when Clipboard contents are reset""" - global _g_clipboard_contents - _g_clipboard_contents = None - def set_quote_format(self, format): self._quote_format = format def get_quote_format(self): return self._quote_format - #============================================= # State - def is_modified(self): - """Returns True if buffer is modified""" - if self._textbuffer: return self._textbuffer.get_modified() - else: - return False + return False def _on_modified_changed(self, textbuffer): - """Callback for when buffer is modified""" - - # propogate modified signal to listeners of this textview self.emit("modified", textbuffer.get_modified()) def enable(self): self.set_sensitive(True) def disable(self): - """Disable TextView""" - if self._textbuffer: self._textbuffer.handler_block(self._modified_id) - self._textbuffer.clear() + if hasattr(self._textbuffer, "clear"): + self._textbuffer.clear() + else: + self._textbuffer.set_text("") # GTK 方式清除文本内容 + self._textbuffer.set_modified(False) self._textbuffer.handler_unblock(self._modified_id) - self.set_sensitive(False) - """ - def serialize(self, register_buf, content_buf, start, end, data): - print "serialize", content_buf - self.a = u"SERIALIZED" - return self.a - - def deserialize(self, register_buf, content_buf, it, data, - create_tags, udata): - print "deserialize" - """ - - #===================================================== # Popup Menus - - def on_popup(self, textview, menu): - """Popup menu for RichTextView""" - self._popup_menu = menu - - # position of 'paste' option - pos = 3 - - # insert additional menu options after paste - item = gtk.ImageMenuItem(stock_id=gtk.STOCK_PASTE, accel_group=None) - item.child.set_text(_("Paste As Plain Text")) - item.connect("activate", lambda item: self.paste_clipboard_as_text()) - item.show() - menu.insert(item, pos) - - item = gtk.ImageMenuItem(stock_id=gtk.STOCK_PASTE, accel_group=None) - item.child.set_text(_("Paste As Quote")) - item.connect("activate", lambda item: self.paste_clipboard_as_quote()) - item.show() - menu.insert(item, pos+1) - - item = gtk.ImageMenuItem(stock_id=gtk.STOCK_PASTE, accel_group=None) - item.child.set_text(_("Paste As Plain Text Quote")) - item.connect( - "activate", - lambda item: self.paste_clipboard_as_quote(plain_text=True)) - item.show() - menu.insert(item, pos+2) - - menu.set_accel_path(self._accel_path) - if self._accel_group: - menu.set_accel_group(self._accel_group) - def _on_child_popup_menu(self, textbuffer, child, button, activate_time): - """Callback for when child menu should appear""" self._image_menu.set_child(child) - - # popup menu based on child widget if isinstance(child, RichTextImage): - # image menu - self._image_menu.popup(None, None, None, button, activate_time) - self._image_menu.show() - - def get_image_menu(self): - """Returns the image popup menu""" - return self._image_menu - - def get_popup_menu(self): - """Returns the popup menu""" - return self._popup_menu - - #========================================== - # child events + cursor_iter = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) + cursor_rect = self.get_iter_location(cursor_iter) + self._image_menu.set_pointing_to(Gdk.Rectangle(cursor_rect.x, cursor_rect.y, 1, 1)) + self._image_menu.popup() def _on_child_added(self, textbuffer, child): - """Callback when child added to buffer""" self._add_children() def _on_child_activated(self, textbuffer, child): - """Callback for when child has been activated""" self.emit("child-activated", child) - #=========================================================== - # Actions + def get_image_menu(self): + return self._image_menu + + def get_popup_menu(self): + return self._context_menu + # Actions def _add_children(self): - """Add all deferred children in textbuffer""" self._textbuffer.add_deferred_anchors(self) def indent(self): - """Indents selection one more level""" if self._textbuffer: self._textbuffer.indent() def unindent(self): - """Unindents selection one more level""" if self._textbuffer: self._textbuffer.unindent() def insert_image(self, image, filename="image.png"): - """Inserts an image into the textbuffer""" if self._textbuffer: self._textbuffer.insert_image(image, filename) def insert_image_from_file(self, imgfile, filename="image.png"): - """Inserts an image from a file""" - pixbuf = gdk.pixbuf_new_from_file(imgfile) + pixbuf = GdkPixbuf.Pixbuf.new_from_file(imgfile) img = RichTextImage() img.set_from_pixbuf(pixbuf) self.insert_image(img, filename) def insert_hr(self): - """Inserts a horizontal rule""" if self._textbuffer: self._textbuffer.insert_hr() def insert_html(self, html): - """Insert HTML content into Buffer""" if self._textbuffer: self._textbuffer.insert_contents(self.parse_html(html)) def parse_html(self, html): contents = list(self._html_buffer.read( - StringIO.StringIO(html), partial=True, ignore_errors=True)) - - # scan contents + io.StringIO(html), partial=True, ignore_errors=True)) for kind, pos, param in contents: - # download images included in html if kind == "anchor" and isinstance(param[0], RichTextImage): img = param[0] filename = img.get_filename() - if filename and (filename.startswith("http:") or - filename.startswith("file:")): + if filename and (filename.startswith("http:") or filename.startswith("file:")): try: img.set_from_url(filename, "image.png") except: - # Be robust to errors from loading from the web. pass - return contents def get_link(self, it=None): @@ -1226,7 +748,6 @@ def get_link(self, it=None): def set_link(self, url="", start=None, end=None): if self._textbuffer is None: return - if start is None or end is None: tagname = RichTextLinkTag.tag_name(url) self._apply_tag(tagname) @@ -1234,25 +755,18 @@ def set_link(self, url="", start=None, end=None): else: return self._textbuffer.set_link(url, start, end) - #========================================================== # Find/Replace - def forward_search(self, it, text, case_sensitive, wrap=True): - """Finds next occurrence of 'text' searching forwards""" it = it.copy() if not case_sensitive: text = text.lower() - textlen = len(text) - while True: end = it.copy() end.forward_chars(textlen) - text2 = it.get_slice(end) if not case_sensitive: text2 = text2.lower() - if text2 == text: return it, end if not it.forward_char(): @@ -1264,23 +778,17 @@ def forward_search(self, it, text, case_sensitive, wrap=True): return None def backward_search(self, it, text, case_sensitive, wrap=True): - """Finds next occurrence of 'text' searching backwards""" - it = it.copy() it.backward_char() if not case_sensitive: text = text.lower() - textlen = len(text) - while True: end = it.copy() end.forward_chars(textlen) - text2 = it.get_slice(end) if not case_sensitive: text2 = text2.lower() - if text2 == text: return it, end if not it.backward_char(): @@ -1292,19 +800,15 @@ def backward_search(self, it, text, case_sensitive, wrap=True): return None def find(self, text, case_sensitive=False, forward=True, next=True): - """Finds next occurrence of 'text'""" if not self._textbuffer: return - it = self._textbuffer.get_iter_at_mark(self._textbuffer.get_insert()) - if forward: if next: it.forward_char() result = self.forward_search(it, text, case_sensitive) else: result = self.backward_search(it, text, case_sensitive) - if result: self._textbuffer.select_range(result[0], result[1]) self.scroll_mark_onscreen(self._textbuffer.get_insert()) @@ -1312,90 +816,53 @@ def find(self, text, case_sensitive=False, forward=True, next=True): else: return -1 - def replace(self, text, replace_text, - case_sensitive=False, forward=True, next=False): - """Replaces next occurrence of 'text' with 'replace_text'""" - + def replace(self, text, replace_text, case_sensitive=False, forward=True, next=False): if not self._textbuffer: return - pos = self.find(text, case_sensitive, forward, next) - if pos != -1: self._textbuffer.begin_user_action() self._textbuffer.delete_selection(True, self.get_editable()) self._textbuffer.insert_at_cursor(replace_text) self._textbuffer.end_user_action() - return pos - def replace_all(self, text, replace_text, - case_sensitive=False, forward=True): - """Replaces all occurrences of 'text' with 'replace_text'""" - + def replace_all(self, text, replace_text, case_sensitive=False, forward=True): if not self._textbuffer: return - found = False - self._textbuffer.begin_user_action() - while self.replace( - text, replace_text, case_sensitive, forward, False) != -1: + while self.replace(text, replace_text, case_sensitive, forward, False) != -1: found = True self._textbuffer.end_user_action() - return found - #=========================================================== - # Spell check - + # Spell check (disabled for now) def can_spell_check(self): - """Returns True if spelling is available""" - return gtkspell is not None + return False # GtkSpell not supported in this migration def enable_spell_check(self, enabled=True): - """Enables/disables spell check""" - if not self.can_spell_check(): - return - - if enabled: - if self._spell_checker is None: - try: - self._spell_checker = gtkspell.Spell(self) - except Exception: - # unable to intialize spellcheck, abort - self._spell_checker = None - else: - if self._spell_checker is not None: - self._spell_checker.detach() - self._spell_checker = None + pass # Not implemented def is_spell_check_enabled(self): - """Returns True if spell check is enabled""" - return self._spell_checker is not None - - #=========================================================== - # font manipulation + return False + # Font manipulation def _apply_tag(self, tag_name): if self._textbuffer: self._textbuffer.apply_tag_selected( self._textbuffer.tag_table.lookup(tag_name)) def toggle_font_mod(self, mod): - """Toggle a font modification""" if self._textbuffer: self._textbuffer.toggle_tag_selected( self._textbuffer.tag_table.lookup( RichTextModTag.tag_name(mod))) def set_font_mod(self, mod): - """Sets a font modification""" self._apply_tag(RichTextModTag.tag_name(mod)) def toggle_link(self): - """Toggles a link tag""" - tag, start, end = self.get_link() if not tag: tag = self._textbuffer.tag_table.lookup( @@ -1403,19 +870,15 @@ def toggle_link(self): self._textbuffer.toggle_tag_selected(tag) def set_font_family(self, family): - """Sets the family font of the selection""" self._apply_tag(RichTextFamilyTag.tag_name(family)) def set_font_size(self, size): - """Sets the font size of the selection""" self._apply_tag(RichTextSizeTag.tag_name(size)) def set_justify(self, justify): - """Sets the text justification""" self._apply_tag(RichTextJustifyTag.tag_name(justify)) def set_font_fg_color(self, color): - """Sets the text foreground color""" if self._textbuffer: if color: self._textbuffer.toggle_tag_selected( @@ -1427,9 +890,7 @@ def set_font_fg_color(self, color): RichTextFGColorTag.tag_name("#000000"))) def set_font_bg_color(self, color): - """Sets the text background color""" if self._textbuffer: - if color: self._textbuffer.toggle_tag_selected( self._textbuffer.tag_table.lookup( @@ -1440,135 +901,54 @@ def set_font_bg_color(self, color): RichTextBGColorTag.tag_name("#000000"))) def toggle_bullet(self, par_type=None): - """Toggle state of a bullet list""" if self._textbuffer: self._textbuffer.toggle_bullet_list(par_type) def set_font(self, font_name): - """Font change from choose font widget""" if not self._textbuffer: return - family, mods, size = parse_font(font_name) - self._textbuffer.begin_user_action() - - # apply family and size tags self.set_font_family(family) self.set_font_size(size) - - # apply modifications for mod in mods: self.set_font_mod(mod) - - # disable modifications not given mod_class = self._textbuffer.tag_table.get_tag_class("mod") for tag in mod_class.tags: if tag.get_property("name") not in mods: self._textbuffer.remove_tag_selected(tag) - self._textbuffer.end_user_action() - #================================================================== - # UI Updating from changing font under cursor - def _on_font_change(self, textbuffer, font): - """Callback for when font under cursor changes""" - # forward signal along to listeners self.emit("font-change", font) def get_font(self): - """Get the font under the cursor""" if self._textbuffer: return self._textbuffer.get_font() - else: - return self._blank_buffer.get_font() + return self._blank_buffer.get_font() def set_default_font(self, font): - """Sets the default font of the textview""" try: - - # HACK: fix small font sizes on Mac - #PIXELS_PER_PANGO_UNIT = 1024 - #native_size = (self.get_default_attributes().font.get_size() - # // PIXELS_PER_PANGO_UNIT) - #set_text_scale(native_size / 10.0) - - f = pango.FontDescription(font) - f.set_size(int(f.get_size() * get_text_scale())) - self.modify_font(f) + f = Pango.FontDescription(font) + size = f.get_size() / Pango.SCALE # Convert from Pango units to points + if not f.get_size_is_absolute(): + size *= get_text_scale() + css = f"*{{\nfont-family: {f.get_family()};\nfont-size: {size}px;\n}}" + provider = Gtk.CssProvider() + provider.load_from_data(css.encode('utf-8')) + self.get_style_context().add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + if self._textbuffer: + self._textbuffer.set_default_font(font) # Assuming this method exists or can be added except: - # TODO: think about how to handle this error pass - #========================================= - # undo/redo methods - + # Undo/Redo def undo(self): - """Undo the last action in the RichTextView""" if self._textbuffer: self._textbuffer.undo() self.scroll_mark_onscreen(self._textbuffer.get_insert()) def redo(self): - """Redo the last action in the RichTextView""" if self._textbuffer: self._textbuffer.redo() - self.scroll_mark_onscreen(self._textbuffer.get_insert()) - - -# register new signals -gobject.type_register(RichTextView) -gobject.signal_new("modified", RichTextView, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (bool,)) -gobject.signal_new("font-change", RichTextView, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("child-activated", RichTextView, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("visit-url", RichTextView, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str,)) - - -''' - def drop_pdf(self, data): - """Drop a PDF into the TextView""" - - if not self._textbuffer: - return - - # NOTE: requires hardcoded convert - # TODO: generalize - - self._textbuffer.begin_user_action() - - try: - f, imgfile = tempfile.mkstemp(".png", "pdf") - os.close(f) - - out = os.popen("convert - %s" % imgfile, "wb") - out.write(data) - out.close() - - name, ext = os.path.splitext(imgfile) - imgfile2 = name + "-0" + ext - - if os.path.exists(imgfile2): - i = 0 - while True: - imgfile = name + "-" + str(i) + ext - if not os.path.exists(imgfile): - break - self.insert_image_from_file(imgfile) - os.remove(imgfile) - i += 1 - - elif os.path.exists(imgfile): - - self.insert_image_from_file(imgfile) - os.remove(imgfile) - except: - if os.path.exists(imgfile): - os.remove(imgfile) - - self._textbuffer.end_user_action() - ''' + self.scroll_mark_onscreen(self._textbuffer.get_insert()) \ No newline at end of file diff --git a/keepnote/gui/richtext/font_handler.py b/keepnote/gui/richtext/font_handler.py index c5669b103..1144e8451 100644 --- a/keepnote/gui/richtext/font_handler.py +++ b/keepnote/gui/richtext/font_handler.py @@ -1,81 +1,98 @@ -""" - - KeepNote - Font handler for RichText buffer. - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gobject +import gi +gi.require_version('Gtk', '4.0') +# PyGObject imports (GTK 4) +from gi.repository import Gtk, GObject +# Local imports from .undo_handler import InsertAction - -# richtext imports from .richtextbase_tags import RichTextTag - -#============================================================================= -# fonts buffer - - -class RichTextBaseFont (object): +# Font class +class RichTextBaseFont(object): """Class for representing a font in a simple way""" def __init__(self): - pass - - def set_font(self, attr, tags, current_tags, tag_table): - pass - - -class FontHandler (gobject.GObject): + self.family = None + self.size = None + self.bold = False + self.italic = False + self.underline = False + self.fg_color = None + self.bg_color = None + + def set_font(self, tags, current_tags, tag_table): + """Set font properties based on tags and current tags""" + # Default font properties + self.family = "Sans" + self.size = 10 + self.bold = False + self.italic = False + self.underline = False + self.fg_color = None + self.bg_color = None + + # Apply properties from tags + for tag in tags: + if hasattr(tag, 'get_property'): + if tag.get_property("family"): + self.family = tag.get_property("family") + if tag.get_property("size-points"): + self.size = tag.get_property("size-points") + if tag.get_property("weight") == 700: # Pango.Weight.BOLD + self.bold = True + if tag.get_property("style") == 2: # Pango.Style.ITALIC + self.italic = True + if tag.get_property("underline") == 1: # Pango.Underline.SINGLE + self.underline = True + if tag.get_property("foreground"): + self.fg_color = tag.get_property("foreground") + if tag.get_property("background"): + self.bg_color = tag.get_property("background") + + # Apply properties from current_tags + for tag in current_tags: + if hasattr(tag, 'get_property'): + if tag.get_property("family"): + self.family = tag.get_property("family") + if tag.get_property("size-points"): + self.size = tag.get_property("size-points") + if tag.get_property("weight") == 700: + self.bold = True + if tag.get_property("style") == 2: + self.italic = True + if tag.get_property("underline") == 1: + self.underline = True + if tag.get_property("foreground"): + self.fg_color = tag.get_property("foreground") + if tag.get_property("background"): + self.bg_color = tag.get_property("background") + +class FontHandler(GObject.GObject): """Basic RichTextBuffer with the following features - manages "current font" behavior """ + __gsignals__ = { + "font-change": (GObject.SignalFlags.RUN_LAST, None, (object,)), + } + def __init__(self, textbuffer): - gobject.GObject.__init__(self) + super().__init__() self._buf = textbuffer self._current_tags = [] - self._default_attr = gtk.TextAttributes() + self._default_attr = None # GTK 4 still does not use TextAttributes directly self._font_class = RichTextBaseFont self._insert_mark = self._buf.get_insert() self._buf.connect("mark-set", self._on_mark_set) - #============================================================== # Tag manipulation - def update_current_tags(self, action): """Check if current tags need to be applied due to action""" self._buf.begin_user_action() if isinstance(action, InsertAction): - - # apply current style to inserted text if inserted text is - # at cursor + # Apply current style to inserted text if inserted text is at cursor if action.cursor_insert and len(action.current_tags) > 0: it = self._buf.get_iter_at_offset(action.pos) it2 = it.copy() @@ -87,16 +104,12 @@ def update_current_tags(self, action): self._buf.end_user_action() def _on_mark_set(self, textbuffer, it, mark): - if mark is self._insert_mark: - - # if cursor at startline pick up opening tags, - # otherwise closing tags + # If cursor at start of line, pick up opening tags, otherwise closing tags opening = it.starts_line() self.set_current_tags( [x for x in it.get_toggled_tags(opening) - if isinstance(x, RichTextTag) and - x.can_be_current()]) + if isinstance(x, RichTextTag) and x.can_be_current()]) def set_default_attr(self, attr): self._default_attr = attr @@ -125,7 +138,7 @@ def toggle_tag_selected(self, tag, start=None, end=None): else: it = [start, end] - # toggle current tags + # Toggle current tags if self.can_be_current_tag(tag): if tag not in self._current_tags: self.clear_current_tag_class(tag) @@ -133,7 +146,7 @@ def toggle_tag_selected(self, tag, start=None, end=None): else: self._current_tags.remove(tag) - # update region + # Update region if len(it) == 2: if not it[0].has_tag(tag): self.clear_tag_class(tag, it[0], it[1]) @@ -142,7 +155,6 @@ def toggle_tag_selected(self, tag, start=None, end=None): self._buf.remove_tag(tag, it[0], it[1]) self._buf.end_user_action() - self.emit("font-change", self.get_font()) def apply_tag_selected(self, tag, start=None, end=None): @@ -154,18 +166,17 @@ def apply_tag_selected(self, tag, start=None, end=None): else: it = [start, end] - # update current tags + # Update current tags if self.can_be_current_tag(tag): if tag not in self._current_tags: self.clear_current_tag_class(tag) self._current_tags.append(tag) - # update region + # Update region if len(it) == 2: self.clear_tag_class(tag, it[0], it[1]) self._buf.apply_tag(tag, it[0], it[1]) self._buf.end_user_action() - self.emit("font-change", self.get_font()) def remove_tag_selected(self, tag, start=None, end=None): @@ -177,15 +188,14 @@ def remove_tag_selected(self, tag, start=None, end=None): else: it = [start, end] - # no selection, remove tag from current tags + # No selection, remove tag from current tags if tag in self._current_tags: self._current_tags.remove(tag) - # update region + # Update region if len(it) == 2: self._buf.remove_tag(tag, it[0], it[1]) self._buf.end_user_action() - self.emit("font-change", self.get_font()) def remove_tag_class_selected(self, tag, start=None, end=None): @@ -197,37 +207,31 @@ def remove_tag_class_selected(self, tag, start=None, end=None): else: it = [start, end] - # no selection, remove tag from current tags + # No selection, remove tag from current tags self.clear_current_tag_class(tag) - # update region + # Update region if len(it) == 2: self.clear_tag_class(tag, it[0], it[1]) self._buf.end_user_action() - self.emit("font-change", self.get_font()) def clear_tag_class(self, tag, start, end): - """ - Remove all tags of the same class as 'tag' in region (start, end) - """ - cls = self._buf.tag_table.get_class_of_tag(tag) + """Remove all tags of the same class as 'tag' in region (start, end)""" + cls = self._buf.get_tag_table().get_class_of_tag(tag) if cls is not None and cls.exclusive: for tag2 in cls.tags: self._buf.remove_tag(tag2, start, end) - self.emit("font-change", self.get_font()) def clear_current_tag_class(self, tag): """Remove all tags of the same class as 'tag' from current tags""" - cls = self._buf.tag_table.get_class_of_tag(tag) + cls = self._buf.get_tag_table().get_class_of_tag(tag) if cls is not None and cls.exclusive: self._current_tags = [x for x in self._current_tags if x not in cls.tags] - #=========================================================== # Font management - def get_font_class(self): return self._font_class @@ -236,8 +240,7 @@ def set_font_class(self, font_class): def get_font(self, font=None): """Returns the active font under the cursor""" - - # get iter for retrieving font + # Get iter for retrieving font it2 = self._buf.get_selection_bounds() if len(it2) == 0: @@ -246,23 +249,33 @@ def get_font(self, font=None): it = it2[0] it.forward_char() - # create a set that is fast for quering the existance of tags + # Create a set that is fast for querying the existence of tags current_tags = set(self._current_tags) - # get the text attributes and font at the iter - attr = gtk.TextAttributes() - self._default_attr.copy_values(attr) - it.get_attributes(attr) + # Get the tags at the iter tags = it.get_tags() - # create font object and return + # Create font object and return if font is None: font = self.get_font_class()() - font.set_font(attr, tags, current_tags, self._buf.tag_table) + font.set_font(tags, current_tags, self._buf.get_tag_table()) return font - -gobject.type_register(FontHandler) -gobject.signal_new("font-change", FontHandler, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) +# Example usage (optional, for testing) +if __name__ == "__main__": + win = Gtk.Window() + textview = Gtk.TextView() + buffer = textview.get_buffer() + font_handler = FontHandler(buffer) + + # Create some example tags + tag_bold = buffer.create_tag("bold", weight=700) + tag_italic = buffer.create_tag("italic", style=2) + buffer.insert(buffer.get_start_iter(), "Hello, world!", -1) + font_handler.apply_tag_selected(tag_bold) + + win.set_child(textview) + win.connect("close-request", Gtk.main_quit) + win.show() + Gtk.main() \ No newline at end of file diff --git a/keepnote/gui/richtext/indent_handler.py b/keepnote/gui/richtext/indent_handler.py index 2d6214a5b..33bb96f23 100644 --- a/keepnote/gui/richtext/indent_handler.py +++ b/keepnote/gui/richtext/indent_handler.py @@ -1,28 +1,4 @@ -""" - - KeepNote - Richtext indentation handler - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# + from .textbuffer_tools import \ move_to_start_of_line, \ @@ -30,11 +6,11 @@ paragraph_iter from .richtext_tags import RichTextIndentTag from .richtextbasebuffer import get_paragraph -from textbuffer_tools import get_paragraphs_selected +from .textbuffer_tools import get_paragraphs_selected # string for bullet points -BULLET_STR = u"\u2022 " +BULLET_STR = "\u2022 " #============================================================================= diff --git a/keepnote/gui/richtext/richtext_html.py b/keepnote/gui/richtext/richtext_html.py index 296404ba4..8cbc90b4d 100644 --- a/keepnote/gui/richtext/richtext_html.py +++ b/keepnote/gui/richtext/richtext_html.py @@ -5,33 +5,14 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports import sys import re -from HTMLParser import HTMLParser +from html.parser import HTMLParser from xml.sax.saxutils import escape -# keepnote imports -from keepnote import log_error, log_message +# keepnote.py imports + from .textbuffer_tools import \ normalize_tags, \ @@ -77,7 +58,7 @@ """ HTML_FOOTER = "" -BULLET_STR = u"\u2022 " +BULLET_STR = "\u2022 " JUSTIFY_VALUES = set([ "left", @@ -309,8 +290,7 @@ def parse_css_style(stylestr): if statement.startswith("font-size"): # font size size = int(float( - "".join(filter(lambda x: x.isdigit() or x == ".", - statement.split(":")[1])))) + "".join([x for x in statement.split(":")[1] if x.isdigit() or x == "."]))) yield "size " + str(size) elif statement.startswith("font-family"): @@ -388,7 +368,7 @@ def __init__(self, kind): self.kind = kind -class HtmlError (StandardError): +class HtmlError (Exception): """Error for HTML parsing""" pass @@ -908,6 +888,7 @@ def set_output(self, out): # Reading HTML def read(self, infile, partial=False, ignore_errors=False): + from keepnote import log_error """Read from stream infile to populate textbuffer""" #self._text_queue = [] self._within_body = False @@ -924,7 +905,7 @@ def read(self, infile, partial=False, ignore_errors=False): self.feed(infile.read()) self.close() - except Exception, e: + except Exception as e: log_error(e, sys.exc_info()[2]) # reraise error if not ignored self.close() @@ -1107,7 +1088,7 @@ def _write_header(self, title, xhtml=True): else: self._out.write(HTML_HEADER) if title: - self._out.write(u"%s\n" % escape(title)) + self._out.write("%s\n" % escape(title)) self._out.write("") def _write_footer(self, xhtml=True): @@ -1157,6 +1138,7 @@ def write_text(self, text, xhtml=True): self._out.write(text) def write_anchor(self, dom, anchor, xhtml=True): + from keepnote import log_message """Write an anchor object""" for tag_writer in self._tag_writers: if isinstance(anchor, tag_writer.tagclass): diff --git a/keepnote/gui/richtext/richtext_tags.py b/keepnote/gui/richtext/richtext_tags.py index 87aec454a..fb3f3819a 100644 --- a/keepnote/gui/richtext/richtext_tags.py +++ b/keepnote/gui/richtext/richtext_tags.py @@ -1,118 +1,62 @@ """ - - KeepNote - TagTable and Tags for RichTextBuffer - +KeepNote +TagTable and Tags for RichTextBuffer """ +import gi +gi.require_version('Gtk', '4.0') +# PyGObject imports (GTK 4) +from gi.repository import Gtk, Pango, Gdk -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import pango - -# richtext imports +# RichText imports from .richtextbase_tags import \ RichTextBaseTagTable, \ RichTextTag - -# TODO: remove hard coding for 'Sans 10' -# default indentation sizes -#MIN_INDENT = 5 +# Default indentation sizes MIN_INDENT = 30 - 6 INDENT_SIZE = 30 -BULLET_PAR_INDENT = 12 # hard-coded for 'Sans 10' +BULLET_PAR_INDENT = 12 # Hard-coded for 'Sans 10' BULLET_FONT_SIZE = 10 - def color_to_string(color): - """Converts a gtk.Color to a RGB string (#rrrrggggbbbb)""" - redstr = hex(color.red)[2:] - greenstr = hex(color.green)[2:] - bluestr = hex(color.blue)[2:] - - # pad with zeros - while len(redstr) < 4: - redstr = "0" + redstr - while len(greenstr) < 4: - greenstr = "0" + greenstr - while len(bluestr) < 4: - bluestr = "0" + bluestr - - return "#%s%s%s" % (redstr, greenstr, bluestr) - + """Converts a color string to a RGB string (#RRGGBB)""" + # In GTK 4, color can be a string or Gdk.RGBA + if isinstance(color, Gdk.RGBA): + # GTK 4's Gdk.RGBA.to_string() returns rgba(r,g,b,a), we want #RRGGBB + r = int(color.red * 255) + g = int(color.green * 255) + b = int(color.blue * 255) + return f"#{r:02x}{g:02x}{b:02x}" + return color # Assume it's already a string like '#RRGGBB' def color_tuple_to_string(color): - """Converts a color tuple (r,g,b) to a RGB string (#rrrrggggbbbb)""" - - redstr = hex(color[0])[2:] - greenstr = hex(color[1])[2:] - bluestr = hex(color[2])[2:] - - # pad with zeros - while len(redstr) < 4: - redstr = "0" + redstr - while len(greenstr) < 4: - greenstr = "0" + greenstr - while len(bluestr) < 4: - bluestr = "0" + bluestr - - return "#%s%s%s" % (redstr, greenstr, bluestr) - + """Converts a color tuple (r,g,b) to a RGB string (#RRGGBB)""" + redstr = hex(color[0])[2:].zfill(2) + greenstr = hex(color[1])[2:].zfill(2) + bluestr = hex(color[2])[2:].zfill(2) + return f"#{redstr}{greenstr}{bluestr}" _text_scale = 1.0 - def get_text_scale(): """Returns current text scale""" global _text_scale - if _text_scale is None: - _text_scale = (float(gtk.gdk.screen_height()) / - gtk.gdk.screen_height_mm()) / 2.95566 - return _text_scale - def set_text_scale(scale): global _text_scale _text_scale = scale - def get_attr_size(attr): - #return int(attr.font_scale * 10.0) - #print font.get_style() - PIXELS_PER_PANGO_UNIT = 1024 - return attr.font.get_size() // int( - get_text_scale() * PIXELS_PER_PANGO_UNIT) + # In GTK 4, TextAttributes are not used; this is a placeholder + return 10 # Default size in points - -class RichTextTagTable (RichTextBaseTagTable): +class RichTextTagTable(RichTextBaseTagTable): """A tag table for a RichTextBuffer""" - def __init__(self): - RichTextBaseTagTable.__init__(self) + super().__init__() - # class sets + # Class sets self.new_tag_class("mod", RichTextModTag, exclusive=False) self.new_tag_class("justify", RichTextJustifyTag) self.new_tag_class("family", RichTextFamilyTag) @@ -123,52 +67,47 @@ def __init__(self): self.new_tag_class("bullet", RichTextBulletTag) self.new_tag_class("link", RichTextLinkTag) - # modification (mod) font tags + # Modification (mod) font tags # All of these can be combined self.tag_class_add( "mod", - RichTextModTag("bold", weight=pango.WEIGHT_BOLD)) + RichTextModTag("bold", weight=Pango.Weight.BOLD)) self.tag_class_add( "mod", - RichTextModTag("italic", style=pango.STYLE_ITALIC)) + RichTextModTag("italic", style=Pango.Style.ITALIC)) self.tag_class_add( "mod", - RichTextModTag("underline", - underline=pango.UNDERLINE_SINGLE)) + RichTextModTag("underline", underline=Pango.Underline.SINGLE)) self.tag_class_add( "mod", - RichTextModTag("strike", - strikethrough=True)) + RichTextModTag("strike", strikethrough=True)) self.tag_class_add( "mod", RichTextModTag("tt", family="Monospace")) self.tag_class_add( "mod", - RichTextModTag("nowrap", wrap_mode=gtk.WRAP_NONE)) + RichTextModTag("nowrap", wrap_mode=Gtk.WrapMode.NONE)) - # justify tags + # Justify tags self.tag_class_add( - "justify", RichTextJustifyTag("left", - justification=gtk.JUSTIFY_LEFT)) + "justify", RichTextJustifyTag("left", justification=Gtk.Justification.LEFT)) self.tag_class_add( - "justify", RichTextJustifyTag("center", - justification=gtk.JUSTIFY_CENTER)) + "justify", RichTextJustifyTag("center", justification=Gtk.Justification.CENTER)) self.tag_class_add( - "justify", RichTextJustifyTag("right", - justification=gtk.JUSTIFY_RIGHT)) + "justify", RichTextJustifyTag("right", justification=Gtk.Justification.RIGHT)) self.tag_class_add( - "justify", RichTextJustifyTag("fill", - justification=gtk.JUSTIFY_FILL)) + "justify", RichTextJustifyTag("fill", justification=Gtk.Justification.FILL)) self.bullet_tag = self.tag_class_add("bullet", RichTextBulletTag()) - -class RichTextModTag (RichTextTag): - """A tag that represents ortholognal font modifications: +class RichTextModTag(RichTextTag): + """A tag that represents orthogonal font modifications: bold, italic, underline, nowrap """ - def __init__(self, name, **kargs): - RichTextTag.__init__(self, name, **kargs) + def __init__(self, name, **kwargs): + super().__init__(name) + for key, value in kwargs.items(): + self.set_property(key, value) @classmethod def tag_name(cls, mod): @@ -178,23 +117,21 @@ def tag_name(cls, mod): def get_value(cls, tag_name): return tag_name - -class RichTextJustifyTag (RichTextTag): - """A tag that represents ortholognal font modifications: - bold, italic, underline, nowrap - """ - +class RichTextJustifyTag(RichTextTag): + """A tag that represents text justification""" justify2name = { - gtk.JUSTIFY_LEFT: "left", - gtk.JUSTIFY_RIGHT: "right", - gtk.JUSTIFY_CENTER: "center", - gtk.JUSTIFY_FILL: "fill" + Gtk.Justification.LEFT: "left", + Gtk.Justification.RIGHT: "right", + Gtk.Justification.CENTER: "center", + Gtk.Justification.FILL: "fill" } justify_names = set(["left", "right", "center", "fill"]) - def __init__(self, name, **kargs): - RichTextTag.__init__(self, name, **kargs) + def __init__(self, name, **kwargs): + super().__init__(name) + for key, value in kwargs.items(): + self.set_property(key, value) def get_justify(self): return self.get_property("name") @@ -211,12 +148,11 @@ def get_value(cls, tag_name): def is_name(cls, tag_name): return tag_name in cls.justify_names - -class RichTextFamilyTag (RichTextTag): +class RichTextFamilyTag(RichTextTag): """A tag that represents a font family""" - def __init__(self, family): - RichTextTag.__init__(self, "family " + family, family=family) + super().__init__("family " + family) + self.set_property("family", family) def get_family(self): return self.get_property("family") @@ -233,17 +169,13 @@ def get_value(cls, tag_name): def is_name(cls, tag_name): return tag_name.startswith("family ") - -class RichTextSizeTag (RichTextTag): +class RichTextSizeTag(RichTextTag): """A tag that represents a font size""" - def __init__(self, size, scale=1.0): - #scale = size / 10.0 - RichTextTag.__init__(self, "size %d" % size, - size_points=int(size * get_text_scale())) + super().__init__("size %d" % size) + self.set_property("size-points", int(size * get_text_scale())) def get_size(self): - #return int(self.get_property("scale") * 10.0) return int(self.get_property("size-points") / get_text_scale()) @classmethod @@ -258,16 +190,16 @@ def get_value(cls, tag_name): def is_name(cls, tag_name): return tag_name.startswith("size ") - -class RichTextFGColorTag (RichTextTag): +class RichTextFGColorTag(RichTextTag): """A tag that represents a font foreground color""" - def __init__(self, color): - RichTextTag.__init__(self, "fg_color %s" % color, - foreground=color) + super().__init__("fg_color %s" % color) + self.set_property("foreground", color) def get_color(self): - return color_to_string(self.get_property("foreground-gdk")) + # In GTK 4, use foreground-rgba and convert to #RRGGBB + rgba = self.get_property("foreground-rgba") + return color_to_string(rgba) @classmethod def tag_name(cls, color): @@ -281,16 +213,16 @@ def get_value(cls, tag_name): def is_name(cls, tag_name): return tag_name.startswith("fg_color ") - -class RichTextBGColorTag (RichTextTag): +class RichTextBGColorTag(RichTextTag): """A tag that represents a font background color""" - def __init__(self, color): - RichTextTag.__init__(self, "bg_color %s" % color, - background=color) + super().__init__("bg_color %s" % color) + self.set_property("background", color) def get_color(self): - return color_to_string(self.get_property("background-gdk")) + # In GTK 4, use background-rgba and convert to #RRGGBB + rgba = self.get_property("background-rgba") + return color_to_string(rgba) @classmethod def tag_name(cls, color): @@ -304,27 +236,19 @@ def get_value(cls, tag_name): def is_name(cls, tag_name): return tag_name.startswith("bg_color ") - -class RichTextIndentTag (RichTextTag): +class RichTextIndentTag(RichTextTag): """A tag that represents an indentation level""" - def __init__(self, indent, par_type="none"): - - #if indent <= 0: - # print "error" - if par_type == "bullet": par_indent_size = BULLET_PAR_INDENT extra_margin = 0 else: - # "none" par_indent_size = 0 extra_margin = BULLET_PAR_INDENT - RichTextTag.__init__( - self, "indent %d %s" % (indent, par_type), - left_margin=MIN_INDENT + INDENT_SIZE * (indent-1) + extra_margin, - indent=-par_indent_size) + super().__init__("indent %d %s" % (indent, par_type)) + self.set_property("left-margin", MIN_INDENT + INDENT_SIZE * (indent-1) + extra_margin) + self.set_property("indent", -par_indent_size) self._indent = indent self._par_type = par_type @@ -336,7 +260,6 @@ def tag_name(cls, indent, par_type="none"): @classmethod def get_value(cls, tag_name): tokens = tag_name.split(" ") - if len(tokens) == 2: return int(tokens[1]), "none" elif len(tokens) == 3: @@ -361,16 +284,10 @@ def get_par_indent(self): def is_par_related(self): return True - -class RichTextBulletTag (RichTextTag): +class RichTextBulletTag(RichTextTag): """A tag that represents a bullet point""" def __init__(self): - RichTextTag.__init__(self, "bullet") -# size_points=BULLET_FONT_SIZE, - #editable=False) - - # TODO: make sure bullet tag has highest priority so that its font - # size overrides + super().__init__("bullet") @classmethod def tag_name(cls): @@ -397,20 +314,16 @@ def can_be_copied(self): def is_par_related(self): return True - -class RichTextLinkTag (RichTextTag): - """A tag that represents hyperlink""" - - LINK_COLOR = "#00000000ffff" +class RichTextLinkTag(RichTextTag): + """A tag that represents a hyperlink""" + LINK_COLOR = "#0000FF" def __init__(self, href): - RichTextTag.__init__(self, "link %s" % href, - foreground=self.LINK_COLOR, - underline=pango.UNDERLINE_SINGLE) + super().__init__("link %s" % href) + self.set_property("foreground", self.LINK_COLOR) + self.set_property("underline", Pango.Underline.SINGLE) self._href = href - #self.connect("event", self.on_event) - def get_href(self): return self._href @@ -429,5 +342,21 @@ def get_value(cls, tag_name): def is_name(cls, tag_name): return tag_name.startswith("link ") - #def on_event(self, texttag, widget, event, it): - # print event, it +# Example usage (optional, for testing) +if __name__ == "__main__": + win = Gtk.Window() + textview = Gtk.TextView() + buffer = textview.get_buffer() + tag_table = RichTextTagTable() + buffer.set_tag_table(tag_table) + + # Add some text and apply tags + buffer.insert(buffer.get_start_iter(), "Hello, world!", -1) + start, end = buffer.get_bounds() + bold_tag = tag_table.lookup("bold") + buffer.apply_tag(bold_tag, start, end) + + win.set_child(textview) + win.connect("close-request", Gtk.main_quit) + win.show() + Gtk.main() \ No newline at end of file diff --git a/keepnote/gui/richtext/richtextbase_tags.py b/keepnote/gui/richtext/richtextbase_tags.py index b86a2885e..e4867e03b 100644 --- a/keepnote/gui/richtext/richtextbase_tags.py +++ b/keepnote/gui/richtext/richtextbase_tags.py @@ -1,50 +1,23 @@ """ - - KeepNote - RichText base classes for tags - +KeepNote +RichText base classes for tags """ +import gi +gi.require_version('Gtk', '4.0') +# PyGObject imports (GTK 4) +from gi.repository import Gtk +# Tag table and tags +class RichTextBaseTagTable(Gtk.TextTagTable): + """A tag table for a RichTextBuffer -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk - - -#============================================================================= -# tags and tag table - - -class RichTextBaseTagTable (gtk.TextTagTable): - """A tag table for a RichTextBuffer""" - - # Class Tags: - # Class tags cannot overlap any other tag of the same class. - # example: a piece of text cannot have two colors, two families, - # two sizes, or two justifications. - + Class Tags: + Class tags cannot overlap any other tag of the same class. + example: a piece of text cannot have two colors, two families, + two sizes, or two justifications. + """ def __init__(self): - gtk.TextTagTable.__init__(self) + super().__init__() self._tag_classes = {} self._tag2class = {} @@ -61,12 +34,13 @@ def remove_textbuffer(self, buf): self._buffers.remove(buf) def remove(self, tag): - gtk.TextTagTable.remove(self, tag) + super().remove(tag) if tag in self._expiring_tags: self._expiring_tags.remove(tag) - cls = self._tag2class[tag] - del self._tag2class[tag] - cls.tags.remove(tag) + cls = self._tag2class.get(tag) + if cls: + del self._tag2class[tag] + cls.tags.remove(tag) def new_tag_class(self, class_name, class_type, exclusive=True): """Create a new RichTextTag class for RichTextBaseTagTable""" @@ -97,15 +71,13 @@ def get_class_of_tag(self, tag): def lookup(self, name): """Lookup any tag, create it if needed""" - - # test to see if name is directly in table - # modifications and justifications are directly stored - tag = gtk.TextTagTable.lookup(self, name) + # Test to see if name is directly in table + tag = super().lookup(name) if tag: return tag - # make tag from scratch - for tag_class in self._tag_classes.itervalues(): + # Make tag from scratch + for tag_class in self._tag_classes.values(): if tag_class.class_type.is_name(name): tag = tag_class.class_type.make_from_name(name) self.tag_class_add(tag_class.name, tag) @@ -120,17 +92,12 @@ def lookup(self, name): def gc(self): """Garbage collect""" - if self.get_size() > self._next_gc_size: - - #print "before", self.get_size() - saved = set() - # test to see if any expiring texttags have completely expired + # Test to see if any expiring texttags have completely expired for buf in self._buffers: - - # scan buffer for all present tags + # Scan buffer for all present tags it = buf.get_start_iter() o = it.get_offset() while True: @@ -143,7 +110,7 @@ def gc(self): break o = it.get_offset() - # remove expired tags + # Remove expired tags remove = [] for tag in self._expiring_tags: if tag not in saved: @@ -153,23 +120,14 @@ def gc(self): self._next_gc_size = self.get_size() + self._gc_size_step - #def func(x, data): - # print "tab", x.get_property("name") - #self.foreach(func) - - #print "after", self.get_size() - - -class RichTextTagClass (object): +class RichTextTagClass(object): """ A class of tags that specify the same attribute Class tags cannot overlap any other tag of the same class. example: a piece of text cannot have two colors, two families, two sizes, or two justifications. - """ - def __init__(self, name, class_type, exclusive=True): """ name: name of the class of tags (i.e. "family", "fg_color") @@ -181,14 +139,13 @@ def __init__(self, name, class_type, exclusive=True): self.class_type = class_type self.exclusive = exclusive - -class RichTextTag (gtk.TextTag): +class RichTextTag(Gtk.TextTag): """A TextTag in a RichTextBuffer""" - def __init__(self, name, **kargs): - gtk.TextTag.__init__(self, name) + def __init__(self, name, **kwargs): + super().__init__(name=name) self._count = 0 - for key, val in kargs.iteritems(): + for key, val in kwargs.items(): self.set_property(key.replace("_", "-"), val) def expires(self): @@ -220,3 +177,31 @@ def is_name(cls, tag_name): @classmethod def make_from_name(cls, tag_name): return cls(cls.get_value(tag_name)) + +class RichTextTagTable(Gtk.TextTagTable): + def __init__(self): + super().__init__() + self._buffers = [] + + def add_textbuffer(self, buffer): + self._buffers.append(buffer) +# Example usage (optional, for testing) +if __name__ == "__main__": + win = Gtk.Window() + textview = Gtk.TextView() + buffer = textview.get_buffer() + tag_table = RichTextBaseTagTable() + buffer.set_tag_table(tag_table) + + # Add a simple tag class and tag for testing + tag_table.new_tag_class("test", RichTextTag, exclusive=True) + test_tag = tag_table.tag_class_add("test", RichTextTag("test-bold", weight=700)) + + buffer.insert(buffer.get_start_iter(), "Hello, world!", -1) + start, end = buffer.get_bounds() + buffer.apply_tag(test_tag, start, end) + + win.set_child(textview) + win.connect("close-request", Gtk.main_quit) + win.show() + Gtk.main() \ No newline at end of file diff --git a/keepnote/gui/richtext/richtextbasebuffer.py b/keepnote/gui/richtext/richtextbasebuffer.py index f5e9c62b1..2d578eb12 100644 --- a/keepnote/gui/richtext/richtextbasebuffer.py +++ b/keepnote/gui/richtext/richtextbasebuffer.py @@ -1,36 +1,13 @@ """ - - KeepNote - Richtext buffer base class - +KeepNote +Richtext buffer base class """ +import gi +gi.require_version('Gtk', '4.0') +# PyGObject imports (GTK 4) +from gi.repository import Gtk, GObject -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gobject - -# import textbuffer tools +# Import textbuffer tools from .textbuffer_tools import \ get_paragraph @@ -40,23 +17,26 @@ DeleteAction, \ InsertChildAction -# richtext imports +# RichText imports from .richtextbase_tags import \ RichTextBaseTagTable, \ RichTextTag - def add_child_to_buffer(textbuffer, it, anchor): textbuffer.add_child(it, anchor) - -#============================================================================= - -class RichTextAnchor (gtk.TextChildAnchor): +# RichTextAnchor class +class RichTextAnchor(Gtk.TextChildAnchor): """Base class of all anchor objects in a RichTextView""" + __gsignals__ = { + "selected": (GObject.SignalFlags.RUN_LAST, None, ()), + "activated": (GObject.SignalFlags.RUN_LAST, None, ()), + "popup-menu": (GObject.SignalFlags.RUN_LAST, None, (int, object)), + "init": (GObject.SignalFlags.RUN_LAST, None, ()), + } def __init__(self): - gtk.TextChildAnchor.__init__(self) + super().__init__() self._widgets = {} self._buffer = None @@ -64,13 +44,13 @@ def add_view(self, view): return None def get_widget(self, view=None): - return self._widgets[view] + return self._widgets.get(view) def get_all_widgets(self): return self._widgets def show(self): - for widget in self._widgets.itervalues(): + for widget in self._widgets.values(): if widget: widget.show() @@ -86,43 +66,34 @@ def copy(self): return anchor def highlight(self): - for widget in self._widgets.itervalues(): + for widget in self._widgets.values(): if widget: widget.highlight() def unhighlight(self): - for widget in self._widgets.itervalues(): + for widget in self._widgets.values(): if widget: widget.unhighlight() - -gobject.type_register(RichTextAnchor) -gobject.signal_new("selected", RichTextAnchor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) -gobject.signal_new("activated", RichTextAnchor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) -gobject.signal_new("popup-menu", RichTextAnchor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (int, object)) -gobject.signal_new("init", RichTextAnchor, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) - - -class RichTextBaseBuffer (gtk.TextBuffer): +class RichTextBaseBuffer(Gtk.TextBuffer): """Basic RichTextBuffer with the following features - maintains undo/redo stacks """ + __gsignals__ = { + "ending-user-action": (GObject.SignalFlags.RUN_LAST, None, ()), + } def __init__(self, tag_table=RichTextBaseTagTable()): - gtk.TextBuffer.__init__(self, tag_table) + super().__init__(tag_table=tag_table) tag_table.add_textbuffer(self) - # undo handler + # Undo handler self._undo_handler = UndoHandler(self) self._undo_handler.after_changed.add(self.on_after_changed) self.undo_stack = self._undo_handler.undo_stack - # insert mark tracking + # Insert mark tracking self._insert_mark = self.get_insert() self._old_insert_mark = self.create_mark( None, self.get_iter_at_mark(self._insert_mark), True) @@ -130,11 +101,11 @@ def __init__(self, tag_table=RichTextBaseTagTable()): self._user_action_ending = False self._noninteractive = 0 - # setup signals + # Setup signals self._signals = [ - # local events - self.connect("begin_user_action", self._on_begin_user_action), - self.connect("end_user_action", self._on_end_user_action), + # Local events + self.connect("begin-user-action", self._on_begin_user_action), + self.connect("end-user-action", self._on_end_user_action), self.connect("mark-set", self._on_mark_set), self.connect("insert-text", self._on_insert_text), self.connect("insert-child-anchor", self._on_insert_child_anchor), @@ -142,10 +113,9 @@ def __init__(self, tag_table=RichTextBaseTagTable()): self.connect("remove-tag", self._on_remove_tag), self.connect("delete-range", self._on_delete_range), - # undo handler events + # Undo handler events self.connect("insert-text", self._undo_handler.on_insert_text), self.connect("delete-range", self._undo_handler.on_delete_range), - self.connect("insert-pixbuf", self._undo_handler.on_insert_pixbuf), self.connect("insert-child-anchor", self._undo_handler.on_insert_child_anchor), self.connect("apply-tag", self._undo_handler.on_apply_tag), @@ -187,9 +157,7 @@ def get_insert_iter(self): """Return TextIter for insert point""" return self.get_iter_at_mark(self.get_insert()) - #========================================================== - # restrict cursor and insert - + # Restrict cursor and insert def is_insert_allowed(self, it, text=""): """Check that insert is allowed at TextIter 'it'""" return it.can_insert(True) @@ -198,27 +166,21 @@ def is_cursor_allowed(self, it): """Returns True if cursor is allowed at TextIter 'it'""" return True - #====================================== - # child widgets - + # Child widgets def add_child(self, it, child): """Add TextChildAnchor to buffer""" pass def update_child(self, action): if isinstance(action, InsertChildAction): - # set buffer of child + # Set buffer of child action.child.set_buffer(self) - #====================================== - # selection callbacks - + # Selection callbacks def on_selection_changed(self): pass - #========================================================= - # paragraph change callbacks - + # Paragraph change callbacks def on_paragraph_split(self, start, end): pass @@ -230,8 +192,7 @@ def on_paragraph_change(self, start, end): def update_paragraphs(self, action): if isinstance(action, InsertAction): - - # detect paragraph spliting + # Detect paragraph splitting if "\n" in action.text: par_start = self.get_iter_at_offset(action.pos) par_end = par_start.copy() @@ -241,69 +202,49 @@ def update_paragraphs(self, action): self.on_paragraph_split(par_start, par_end) elif isinstance(action, DeleteAction): - - # detect paragraph merging + # Detect paragraph merging if "\n" in action.text: par_start, par_end = get_paragraph( self.get_iter_at_offset(action.start_offset)) self.on_paragraph_merge(par_start, par_end) - #================================== - # tag apply/remove - - ''' - def apply_tag(self, tag, start, end): - if isinstance(tag, RichTextTag): - tag.on_apply() - gtk.TextBuffer.apply_tag(self, tag, start, end) - - ''' - + # Tag apply/remove def remove_tag(self, tag, start, end): - #assert self.get_tag_table().lookup( - #tag.get_property("name")) is not None, tag.get_property("name") - gtk.TextBuffer.remove_tag(self, tag, start, end) - - #=========================================================== - # callbacks + super().remove_tag(tag, start, end) + # Callbacks def _on_mark_set(self, textbuffer, it, mark): """Callback for mark movement""" if mark is self._insert_mark: - - # if cursor is not allowed here, move it back + # If cursor is not allowed here, move it back old_insert = self.get_iter_at_mark(self._old_insert_mark) if not self.get_iter_at_mark(mark).equal(old_insert) and \ not self.is_cursor_allowed(it): self.place_cursor(old_insert) return - # when cursor moves, selection changes + # When cursor moves, selection changes self.on_selection_changed() - # keep track of cursor position + # Keep track of cursor position self.move_mark(self._old_insert_mark, it) def _on_insert_text(self, textbuffer, it, text, length): """Callback for text insert""" - - # NOTE: GTK does not give us a proper UTF string, so fix it - text = unicode(text, "utf_8") - - # check to see if insert is allowed + # In GTK 4, text is still a UTF-8 string if textbuffer.is_interactive() and \ not self.is_insert_allowed(it, text): - textbuffer.stop_emission("insert_text") + textbuffer.stop_emission_by_name("insert-text") def _on_insert_child_anchor(self, textbuffer, it, anchor): """Callback for inserting a child anchor""" if not self.is_insert_allowed(it, ""): - self.stop_emission("insert_child_anchor") + self.stop_emission_by_name("insert-child-anchor") def _on_apply_tag(self, textbuffer, tag, start, end): """Callback for tag apply""" if not isinstance(tag, RichTextTag): - # do not process tags that are not rich text + # Do not process tags that are not rich text # i.e. gtkspell tags (ignored by undo/redo) return @@ -313,7 +254,7 @@ def _on_apply_tag(self, textbuffer, tag, start, end): def _on_remove_tag(self, textbuffer, tag, start, end): """Callback for tag remove""" if not isinstance(tag, RichTextTag): - # do not process tags that are not rich text + # Do not process tags that are not rich text # i.e. gtkspell tags (ignored by undo/redo) return @@ -338,10 +279,7 @@ def on_after_changed(self, action): self.end_user_action() - #================================================================== - # records whether text insert is currently user interactive, or is - # automated - + # Records whether text insert is currently user interactive, or is automated def begin_noninteractive(self): """Begins a noninteractive mode""" self._noninteractive += 1 @@ -354,9 +292,7 @@ def is_interactive(self): """Returns True when insert is currently interactive""" return self._noninteractive == 0 - #===================================================================== - # undo/redo methods - + # Undo/redo methods def undo(self): """Undo the last action in the RichTextView""" self.begin_noninteractive() @@ -380,10 +316,4 @@ def _on_end_user_action(self, textbuffer): self._user_action_ending = True self.emit("ending-user-action") self._user_action_ending = False - self.undo_stack.end_action() - - -gobject.type_register(RichTextBaseBuffer) -gobject.signal_new("ending-user-action", RichTextBaseBuffer, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, ()) + self.undo_stack.end_action() \ No newline at end of file diff --git a/keepnote/gui/richtext/richtextbuffer.py b/keepnote/gui/richtext/richtextbuffer.py index 4adbf0a75..741a9a347 100644 --- a/keepnote/gui/richtext/richtextbuffer.py +++ b/keepnote/gui/richtext/richtextbuffer.py @@ -1,53 +1,28 @@ """ - - KeepNote - Richtext buffer class - +KeepNote +Richtext buffer class """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python imports import os import tempfile -import urllib2 +import urllib.request, urllib.error, urllib.parse from itertools import chain +import gi +gi.require_version('Gtk', '4.0') +# PyGObject imports (GTK 4) +from gi.repository import Gtk, GObject, Gdk, GdkPixbuf -# pygtk imports -import pygtk -pygtk.require('2.0') -import gobject -import gtk -from gtk import gdk - -# TODO: remove -# keepnote imports +# KeepNote imports import keepnote -# textbuffer imports +# Textbuffer imports from .textbuffer_tools import \ iter_buffer_contents, \ iter_buffer_anchors, \ insert_buffer_contents -# richtext imports +# RichText imports from .richtextbasebuffer import \ RichTextBaseBuffer, \ add_child_to_buffer, \ @@ -56,7 +31,7 @@ from .font_handler import \ FontHandler, RichTextBaseFont -# richtext tags imports +# RichText tags imports from .richtext_tags import \ RichTextTagTable, \ RichTextJustifyTag, \ @@ -69,38 +44,35 @@ color_to_string, \ get_attr_size - -# these tags will not be enumerated by iter_buffer_contents +# These tags will not be enumerated by iter_buffer_contents IGNORE_TAGS = set(["gtkspell-misspelled"]) -# default maximum undo levels +# Default maximum undo levels MAX_UNDOS = 100 -# string for bullet points -BULLET_STR = u"\u2022 " +# String for bullet points +BULLET_STR = "\u2022 " # NOTE: use a blank user agent for downloading images # many websites refuse the python user agent USER_AGENT = "" -# default color of a richtext background +# Default color of a richtext background (RGB values for white) DEFAULT_BGCOLOR = (65535, 65535, 65535) +# Default color for horizontal rule (black) DEFAULT_HR_COLOR = (0, 0, 0) - def ignore_tag(tag): return tag.get_property("name") in IGNORE_TAGS - # TODO: Maybe move somewhere more general def download_file(url, filename): """Download a url to a file 'filename'""" - try: - # open url and download image - opener = urllib2.build_opener() - request = urllib2.Request(url) + # Open url and download image + opener = urllib.request.build_opener() + request = urllib.request.Request(url) request.add_header('User-Agent', USER_AGENT) infile = opener.open(request) @@ -113,27 +85,14 @@ def download_file(url, filename): except Exception: return False - -#============================================================================= # RichText child objects - -# TODO: remove init signals - - -class BaseWidget (gtk.EventBox): +class BaseWidget(Gtk.Box): """Widgets in RichTextBuffer must support this interface""" - def __init__(self): - gtk.EventBox.__init__(self) - - # TODO: will this be configurable? - # set to white background - self.modify_bg(gtk.STATE_NORMAL, gdk.Color(*DEFAULT_BGCOLOR)) - - # gtk.STATE_ACTIVE - # gtk.STATE_PRELIGHT - # gtk.STATE_SELECTED - # gtk.STATE_INSENSITIVE + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_css_classes(["richtext-base-widget"]) + # Define CSS in your application if needed: + # .richtext-base-widget { background-color: rgb(255, 255, 255); } def highlight(self): pass @@ -142,70 +101,62 @@ def unhighlight(self): pass def show(self): - gtk.EventBox.show_all(self) - - -#gobject.type_register(BaseWidget) -#gobject.signal_new("init", BaseWidget, gobject.SIGNAL_RUN_LAST, -# gobject.TYPE_NONE, ()) + self.set_visible(True) - -class RichTextSep (BaseWidget): +class RichTextSep(BaseWidget): """Separator widget for a Horizontal Rule""" - def __init__(self): - BaseWidget.__init__(self) - self._sep = gtk.HSeparator() - self.add(self._sep) + super().__init__() + self._sep = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL) + self.set_child(self._sep) self._size = None - self._sep.modify_bg(gtk.STATE_NORMAL, gdk.Color(* DEFAULT_HR_COLOR)) - self._sep.modify_fg(gtk.STATE_NORMAL, gdk.Color(* DEFAULT_HR_COLOR)) + # In GTK 4, use CSS for styling instead of modify_bg/fg + self._sep.set_css_classes(["richtext-hr"]) + # Define CSS in your application if needed: + # .richtext-hr { background-color: black; color: black; } - self.connect("size-request", self._on_resize) - self.connect("parent-set", self._on_parent_set) + self.connect("resize", self._on_resize) + self.connect("notify::parent", self._on_parent_set) - self._resizes_id = None + self._resize_id = None - #pixbuf = gdk.Pixbuf(gdk.COLORSPACE_RGB, False, 8, width, height) - #pixbuf.fill(color) - #self._widget.set_from_pixbuf(pixbuf) - #self._widget.img.set_padding(0, padding) - - def _on_parent_set(self, widget, old_parent): + def _on_parent_set(self, widget, pspec): """Callback for changing parent""" - if old_parent: - old_parent.disconnect(self._resize_id) - - if self.get_parent(): - self._resize_id = self.get_parent().connect("size-allocate", - self._on_size_change) - - def _on_size_change(self, widget, req): - """callback for parent's changed size allocation""" + if self._resize_id: + old_parent = self.get_parent() + if old_parent: + old_parent.disconnect(self._resize_id) + parent = self.get_parent() + if parent: + self._resize_id = parent.connect("size-allocate", + self._on_size_change) + + def _on_size_change(self, widget, allocation): + """Callback for parent's changed size allocation""" w, h = self.get_desired_size() self.set_size_request(w, h) - def _on_resize(self, sep, req): + def _on_resize(self, widget, width, height): """Callback for widget resize""" w, h = self.get_desired_size() - req.width = w - req.height = h + self.set_size_request(w, h) def get_desired_size(self): """Returns the desired size""" HR_HORIZONTAL_MARGIN = 20 HR_VERTICAL_MARGIN = 10 - self._size = (self.get_parent().get_allocation().width - - HR_HORIZONTAL_MARGIN, - HR_VERTICAL_MARGIN) + parent = self.get_parent() + if parent: + self._size = (parent.get_width() - HR_HORIZONTAL_MARGIN, + HR_VERTICAL_MARGIN) + else: + self._size = (100, HR_VERTICAL_MARGIN) # Fallback size return self._size - -class RichTextHorizontalRule (RichTextAnchor): +class RichTextHorizontalRule(RichTextAnchor): def __init__(self): - RichTextAnchor.__init__(self) - #self.add_view(None) + super().__init__() def add_view(self, view): self._widgets[view] = RichTextSep() @@ -215,16 +166,13 @@ def add_view(self, view): def copy(self): return RichTextHorizontalRule() - -class BaseImage (BaseWidget): - """Subclasses gtk.Image to make an Image Widget that can be used within - RichTextViewS""" - - def __init__(self, *args, **kargs): - BaseWidget.__init__(self) - self._img = gtk.Image(*args, **kargs) - self._img.show() - self.add(self._img) +class BaseImage(BaseWidget): + """Subclasses Gtk.Image to make an Image Widget that can be used within RichTextViews""" + def __init__(self, *args, **kwargs): + super().__init__() + self._img = Gtk.Image(*args, **kwargs) + self._img.set_visible(True) + self.set_child(self._img) def highlight(self): self.drag_highlight() @@ -236,23 +184,21 @@ def set_from_pixbuf(self, pixbuf): self._img.set_from_pixbuf(pixbuf) def set_from_stock(self, stock, size): - self._img.set_from_stock(stock, size) - + # GTK 4 does not support stock icons, use icon names instead + self._img.set_from_icon_name("image-missing", Gtk.IconSize.NORMAL) def get_image_format(filename): """Returns the image format for a filename""" f, ext = os.path.splitext(filename) - ext = ext.replace(u".", "").lower() + ext = ext.replace(".", "").lower() if ext == "jpg": ext = "jpeg" return ext - -class RichTextImage (RichTextAnchor): +class RichTextImage(RichTextAnchor): """An Image child widget in a RichTextView""" - def __init__(self): - RichTextAnchor.__init__(self) + super().__init__() self._filename = None self._download = False self._pixbuf = None @@ -261,9 +207,9 @@ def __init__(self): self._save_needed = False def __del__(self): - for widget in self._widgets: - widget.disconnect("destroy") - widget.disconnect("button-press-event") + for widget in self._widgets.values(): + widget.disconnect_by_func(self._on_image_destroy) + widget.disconnect_by_func(self._on_clicked) def add_view(self, view): self._widgets[view] = BaseImage() @@ -301,24 +247,18 @@ def save_needed(self): def write(self, filename): """Write image to file""" - - # TODO: make more checks on saving if self._pixbuf: ext = get_image_format(filename) - self._pixbuf_original.save(filename, ext) + self._pixbuf_original.savev(filename, ext, [], []) self._save_needed = False def write_stream(self, stream, filename="image.png"): - """ - Write image to stream - 'filename' is used to infer picture format only. - """ - + """Write image to stream""" def write(buf): stream.write(buf) return True format = get_image_format(filename) - self._pixbuf_original.save_to_callback(write, format) + self._pixbuf_original.save_to_callbackv(write, format, [], []) self._save_needed = False def copy(self): @@ -335,36 +275,27 @@ def copy(self): return img - #===================================================== - # set image - + # Set image def set_from_file(self, filename): """Sets the image from a file""" - - # TODO: remove this assumption (perhaps save full filename, and - # caller will basename() if necessary if self._filename is None: self._filename = os.path.basename(filename) try: - self._pixbuf_original = gdk.pixbuf_new_from_file(filename) - + self._pixbuf_original = GdkPixbuf.Pixbuf.new_from_file(filename) except Exception: - # use missing image instead self.set_no_image() else: - # successful image load, set its size self._pixbuf = self._pixbuf_original if self.is_size_set(): self.scale(self._size[0], self._size[1], False) - for widget in self.get_all_widgets().itervalues(): + for widget in self.get_all_widgets().values(): widget.set_from_pixbuf(self._pixbuf) def set_from_stream(self, stream): - - loader = gtk.gdk.PixbufLoader() + loader = GdkPixbuf.PixbufLoader() try: loader.write(stream.read()) loader.close() @@ -372,19 +303,18 @@ def set_from_stream(self, stream): except Exception: self.set_no_image() else: - # successful image load, set its size self._pixbuf = self._pixbuf_original if self.is_size_set(): self.scale(self._size[0], self._size[1], False) - for widget in self.get_all_widgets().itervalues(): + for widget in self.get_all_widgets().values(): widget.set_from_pixbuf(self._pixbuf) def set_no_image(self): """Set the 'no image' icon""" - for widget in self.get_all_widgets().itervalues(): - widget.set_from_stock(gtk.STOCK_MISSING_IMAGE, gtk.ICON_SIZE_MENU) + for widget in self.get_all_widgets().values(): + widget.set_from_icon_name("image-missing", Gtk.IconSize.NORMAL) self._pixbuf_original = None self._pixbuf = None @@ -398,7 +328,7 @@ def set_from_pixbuf(self, pixbuf, filename=None): if self.is_size_set(): self.scale(self._size[0], self._size[1], True) else: - for widget in self.get_all_widgets().itervalues(): + for widget in self.get_all_widgets().values(): widget.set_from_pixbuf(self._pixbuf) def set_from_url(self, url, filename=None): @@ -406,7 +336,6 @@ def set_from_url(self, url, filename=None): imgfile = None try: - # make local temp file f, imgfile = tempfile.mkstemp("", "image") os.close(f) @@ -421,18 +350,12 @@ def set_from_url(self, url, filename=None): except Exception: self.set_no_image() - # remove tempfile if imgfile and os.path.exists(imgfile): os.remove(imgfile) - #====================== # Image Scaling - def get_size(self, actual_size=False): - """Returns the size of the image - - actual_size: if True, None values will be replaced by original size - """ + """Returns the size of the image""" if actual_size: if self._pixbuf_original is not None: w, h = self._size @@ -455,23 +378,19 @@ def is_size_set(self): def scale(self, width, height, set_widget=True): """Scale the image to a new width and height""" - - if not self.is_valid: + if not self.is_valid(): return self._size = [width, height] if not self.is_size_set(): - # use original image size if self._pixbuf != self._pixbuf_original: self._pixbuf = self._pixbuf_original if self._pixbuf is not None and set_widget: - for widget in self.get_all_widgets().itervalues(): + for widget in self.get_all_widgets().values(): widget.set_from_pixbuf(self._pixbuf) elif self._pixbuf_original is not None: - # perform scaling - width2 = self._pixbuf_original.get_width() height2 = self._pixbuf_original.get_height() @@ -483,56 +402,42 @@ def scale(self, width, height, set_widget=True): height = int(factor * height2) self._pixbuf = self._pixbuf_original.scale_simple( - width, height, gtk.gdk.INTERP_BILINEAR) + width, height, GdkPixbuf.InterpType.BILINEAR) if set_widget: - for widget in self.get_all_widgets().itervalues(): + for widget in self.get_all_widgets().values(): widget.set_from_pixbuf(self._pixbuf) if self._buffer is not None: self._buffer.set_modified(True) - #========================== # GUI callbacks - def _on_image_destroy(self, widget): - for key, value in self._widgets.iteritems(): + for key, value in list(self._widgets.items()): if value == widget: del self._widgets[key] break def _on_clicked(self, widget, event): """Callback for when image is clicked""" - - if event.button == 1: - # left click selects image + button = event.button + if button == 1: widget.grab_focus() - #self._widgets[None].grab_focus() self.emit("selected") - - if event.type == gtk.gdk._2BUTTON_PRESS: - # double left click activates image + if event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS: self.emit("activated") - return True - - elif event.button == 3: - # right click presents popup menu + elif button == 3: self.emit("selected") - self.emit("popup-menu", event.button, event.time) + self.emit("popup-menu", button, event.time) return True - -#============================================================================= -# font - -class RichTextFont (RichTextBaseFont): +# Font +class RichTextFont(RichTextBaseFont): """Class for representing a font in a simple way""" - def __init__(self): - RichTextBaseFont.__init__(self) + super().__init__() - # TODO: remove hard-coding self.mods = {} self.justify = "left" self.family = "Sans" @@ -543,50 +448,24 @@ def __init__(self): self.par_type = "none" self.link = None - def set_font(self, attr, tags, current_tags, tag_table): - # set basic font attr - RichTextBaseFont.set_font(self, attr, tags, current_tags, tag_table) - - font = attr.font - - if font: - # get font family - self.family = font.get_family() - - # get size in points (get_size() returns pango units) - #PIXELS_PER_PANGO_UNIT = 1024 - #self.size = font.get_size() // PIXELS_PER_PANGO_UNIT - self.size = get_attr_size(attr) - - #weight = font.get_weight() - #style = font.get_style() - else: - # TODO: replace this hard-coding - self.family = "Sans" - self.size = 10 - #weight = pango.WEIGHT_NORMAL - #style = pango.STYLE_NORMAL - - # get colors - self.fg_color = color_to_string(attr.fg_color) - self.bg_color = color_to_string(attr.bg_color) - - mod_class = tag_table.get_tag_class("mod") + def set_font(self, tags, current_tags, tag_table): + self.family = "Sans" + self.size = 10 + self.fg_color = "" + self.bg_color = "" tag_set = set(tags) - # set modifications (current tags override) + mod_class = tag_table.get_tag_class("mod") self.mods = {} for tag in mod_class.tags: self.mods[tag.get_property("name")] = (tag in current_tags or tag in tag_set) self.mods["tt"] = (self.mods["tt"] or self.family == "Monospace") - # set justification - self.justify = RichTextJustifyTag.justify2name[attr.justification] + self.justify = "left" - # current tags override for family and size - for tag in current_tags: + for tag in chain(tags, current_tags): if isinstance(tag, RichTextJustifyTag): self.justify = tag.get_justify() elif isinstance(tag, RichTextFamilyTag): @@ -597,20 +476,13 @@ def set_font(self, attr, tags, current_tags, tag_table): self.fg_color = tag.get_color() elif isinstance(tag, RichTextBGColorTag): self.bg_color = tag.get_color() - - # set indentation info - for tag in chain(tags, current_tags): - if isinstance(tag, RichTextIndentTag): + elif isinstance(tag, RichTextIndentTag): self.indent = tag.get_indent() self.par_type = tag.get_par_indent() - elif isinstance(tag, RichTextLinkTag): self.link = tag - -#============================================================================= - -class RichTextBuffer (RichTextBaseBuffer): +class RichTextBuffer: """ TextBuffer specialized for rich text editing @@ -623,43 +495,48 @@ class RichTextBuffer (RichTextBaseBuffer): - horizontal rule - manages editing of indentation levels and bullet point lists - manages "current font" behavior - """ - - def __init__(self, table=RichTextTagTable()): - RichTextBaseBuffer.__init__(self, table) - - # indentation handler - self._indent = IndentHandler(self) - self.connect("ending-user-action", - lambda w: self._indent.update_indentation()) - - # font handler - self.font_handler = FontHandler(self) - self.font_handler.set_font_class(RichTextFont) - self.font_handler.connect( - "font-change", - lambda w, font: self.emit("font-change", font)) - - # set of all anchors in buffer + __gsignals__ = { + "child-added": (GObject.SignalFlags.RUN_LAST, None, (object,)), + "child-activated": (GObject.SignalFlags.RUN_LAST, None, (object,)), + "child-menu": (GObject.SignalFlags.RUN_LAST, None, (object, object, object)), + "font-change": (GObject.SignalFlags.RUN_LAST, None, (object,)), + } + + def __init__(self, tag_table=None): + if tag_table is None: + tag_table = Gtk.TextTagTable() + self.buffer = Gtk.TextBuffer.new(tag_table) + # Check if tag_table is a valid Gtk.TextTagTable and set it + # if isinstance(tag_table, Gtk.TextTagTable): + # self.set_tag_table(tag_table) # Correctly set the tag table + # else: + # raise TypeError("Expected Gtk.TextTagTable, got {0}".format(type(tag_table))) + + # Indentation handler + # Initialize other properties of the RichTextBuffer + self._indent = IndentHandler(self.buffer) # Example of setting up indent handler + self.font_handler = FontHandler(self.buffer) # Set up font handler + self.font_handler.set_font_class(RichTextFont) # Specify the font class + self.font_handler.connect("font-change", lambda w, font: self.emit("font-change", font)) + + # Set of all anchors in buffer self._anchors = set() self._anchors_highlighted = set() - #self._child_uninit = set() - - # anchors that still need to be added, - # they are defferred because textview was not available at insert-time self._anchors_deferred = set() + def get_buffer(self): + return self.buffer + def clear(self): """Clear buffer contents""" - RichTextBaseBuffer.clear(self) + super().clear() self._anchors.clear() self._anchors_highlighted.clear() self._anchors_deferred.clear() def insert_contents(self, contents, it=None): """Inserts a content stream into the TextBuffer at iter 'it'""" - if it is None: it = self.get_insert_iter() @@ -673,25 +550,17 @@ def insert_contents(self, contents, it=None): def copy_contents(self, start, end): """Return a content stream for copying from iter start and end""" - contents = iter(iter_buffer_contents(self, start, end, ignore_tag)) - # remove regions that can't be copied for item in contents: - # NOTE: item = (kind, it, param) - if item[0] == "begin" and not item[2].can_be_copied(): end_tag = item[2] - while not (item[0] == "end" and item[2] == end_tag): - item = contents.next() - + item = next(contents) if item[0] not in ("text", "anchor") and \ item[2] != end_tag: yield item - continue - yield item def on_selection_changed(self): @@ -715,22 +584,16 @@ def on_paragraph_change(self, start, end): def is_insert_allowed(self, it, text=""): """Returns True if insertion is allowed at iter 'it'""" - - # ask the indentation manager whether the insert is allowed return (self._indent.is_insert_allowed(it, text) and it.can_insert(True)) def _on_delete_range(self, textbuffer, start, end): + # Let indent manager prepare the delete (if needed in the future) + # if self.is_interactive(): + # self._indent.prepare_delete_range(start, end) - # TODO: should I add something like this back? - # let indent manager prepare the delete - #if self.is_interactive(): - # self._indent.prepare_delete_range(start, end) + super()._on_delete_range(textbuffer, start, end) - # call super class - RichTextBaseBuffer._on_delete_range(self, textbuffer, start, end) - - # deregister any deleted anchors for kind, offset, param in iter_buffer_contents( self, start, end, ignore_tag): if kind == "anchor": @@ -739,9 +602,7 @@ def _on_delete_range(self, textbuffer, start, end): if child in self._anchors_highlighted: self._anchors_highlighted.remove(child) - #========================================= - # indentation interface - + # Indentation interface def indent(self, start=None, end=None): """Indent paragraph level""" self._indent.change_indent(start, end, 1) @@ -761,9 +622,7 @@ def toggle_bullet_list(self, par_type=None): def get_indent(self, it=None): return self._indent.get_indent(it) - #=============================================== - # font handler interface - + # Font handler interface def update_current_tags(self, action): return self.font_handler.update_current_tags(action) @@ -803,16 +662,11 @@ def clear_current_tag_class(self, tag): def get_font(self, font=None): return self.font_handler.get_font(font) - #============================================================ - # child actions - + # Child actions def add_child(self, it, child): - - # preprocess child if isinstance(child, RichTextImage): self._determine_image_name(child) - # setup child self._anchors.add(child) child.set_buffer(self) child.connect("activated", self._on_child_activated) @@ -820,40 +674,29 @@ def add_child(self, it, child): child.connect("popup-menu", self._on_child_popup_menu) self.insert_child_anchor(it, child) - # let textview, if attached know we added a child self._anchors_deferred.add(child) self.emit("child-added", child) def add_deferred_anchors(self, textview): """Add anchors that were deferred""" - for child in self._anchors_deferred: - # only add anchor if it is still present (hasn't been deleted) if child in self._anchors: self._add_child_at_anchor(child, textview) - self._anchors_deferred.clear() def _add_child_at_anchor(self, child, textview): - - # skip children whose insertion was rejected if child.get_deleted(): return - # TODO: eventually use real view widget = child.add_view(textview) textview.add_child_at_anchor(widget, child) - child.show() def insert_image(self, image, filename="image.png"): """Inserts an image into the textbuffer at current position""" - - # set default filename if image.get_filename() is None: image.set_filename(filename) - # insert image into buffer self.begin_user_action() it = self.get_insert_iter() self.add_child(it, image) @@ -863,23 +706,17 @@ def insert_image(self, image, filename="image.png"): def insert_hr(self): """Insert Horizontal Rule""" self.begin_user_action() - it = self.get_insert_iter() hr = RichTextHorizontalRule() self.add_child(it, hr) - self.end_user_action() - #=================================== # Image management - def get_image_filenames(self): filenames = [] - for child in self._anchors: if isinstance(child, RichTextImage): filenames.append(child.get_filename()) - return filenames def _determine_image_name(self, image): @@ -893,7 +730,6 @@ def _determine_image_name(self, image): image.set_save_needed(True) def _is_new_pixbuf(self, pixbuf): - # cannot tell if pixbuf is new because it is not loaded if pixbuf is None: return False @@ -903,16 +739,9 @@ def _is_new_pixbuf(self, pixbuf): return False return True - #============================================= - # links - + # Links def get_tag_region(self, it, tag): - """ - Get the start and end TextIters for tag occuring at TextIter it - Assumes tag occurs at TextIter it - """ - - # get bounds of link tag + """Get the start and end TextIters for tag occurring at TextIter it""" start = it.copy() if tag not in it.get_toggled_tags(True): start.backward_to_tag_toggle(tag) @@ -924,9 +753,7 @@ def get_tag_region(self, it, tag): return start, end def get_link(self, it=None): - if it is None: - # use cursor sel = self.get_selection_bounds() if len(sel) > 0: it = sel[0] @@ -941,7 +768,6 @@ def get_link(self, it=None): return None, None, None def set_link(self, url, start, end): - if url is None: tag = self.tag_table.lookup(RichTextLinkTag.tag_name("")) self.font_handler.clear_tag_class(tag, start, end) @@ -951,14 +777,9 @@ def set_link(self, url, start, end): self.font_handler.apply_tag_selected(tag, start, end) return tag - #============================================== # Child callbacks - def _on_child_selected(self, child): - """Callback for when child object is selected - - Make sure buffer knows the selection - """ + """Callback for when child object is selected""" it = self.get_iter_at_child_anchor(child) end = it.copy() end.forward_char() @@ -966,14 +787,10 @@ def _on_child_selected(self, child): def _on_child_activated(self, child): """Callback for when child is activated (e.g. double-clicked)""" - - # forward callback to listeners (textview) self.emit("child-activated", child) def _on_child_popup_menu(self, child, button, activate_time): """Callback for when child's menu is visible""" - - # forward callback to listeners (textview) self.emit("child-menu", child, button, activate_time) def highlight_children(self): @@ -989,20 +806,56 @@ def highlight_children(self): for child in highlight: child.highlight() self._anchors_highlighted = highlight - else: - # no selection, unselect all children for child in self._anchors_highlighted: child.unhighlight() self._anchors_highlighted.clear() + def get_insert_iter(self): + return self.buffer.get_insert_iter() + + def get_selection_bounds(self): + return self.buffer.get_selection_bounds() + + def begin_user_action(self): + self.buffer.begin_user_action() + + def end_user_action(self): + self.buffer.end_user_action() + + def select_range(self, start, end): + self.buffer.select_range(start, end) + + def get_iter_at_child_anchor(self, anchor): + return self.buffer.get_iter_at_child_anchor(anchor) + + def insert_child_anchor(self, iter, anchor): + return self.buffer.insert_child_anchor(iter, anchor) + + def is_interactive(self): + return self.buffer.get_property("interactive") # optional, used in indent + + def get_insert_iter(self): + return self.buffer.get_insert_iter() + + def begin_user_action(self): + self.buffer.begin_user_action() + + def end_user_action(self): + self.buffer.end_user_action() + + def get_selection_bounds(self): + return self.buffer.get_selection_bounds() + + def select_range(self, start, end): + return self.buffer.select_range(start, end) + + def get_iter_at_child_anchor(self, anchor): + return self.buffer.get_iter_at_child_anchor(anchor) + + def insert_child_anchor(self, iter, anchor): + return self.buffer.insert_child_anchor(iter, anchor) + + def is_interactive(self): + return self.buffer.get_property("interactive") -gobject.type_register(RichTextBuffer) -gobject.signal_new("child-added", RichTextBuffer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("child-activated", RichTextBuffer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("child-menu", RichTextBuffer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object, object, object)) -gobject.signal_new("font-change", RichTextBuffer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) diff --git a/keepnote/gui/richtext/textbuffer_tools.py b/keepnote/gui/richtext/textbuffer_tools.py index 5181c1887..98fbf808f 100644 --- a/keepnote/gui/richtext/textbuffer_tools.py +++ b/keepnote/gui/richtext/textbuffer_tools.py @@ -5,32 +5,14 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - from keepnote.linked_list import LinkedList from keepnote.linked_tree import LinkedTreeNode -from keepnote.util import PushIter +from keepnote.util.iterutils import PushIter + # TextBuffer uses this char for anchors and pixbufs -ANCHOR_CHAR = u'\ufffc' +ANCHOR_CHAR = '\ufffc' def iter_buffer_contents(textbuffer, start=None, end=None, @@ -483,7 +465,7 @@ def __init__(self): LinkedTreeNode.__init__(self) def display_indent(self, indent, *text): - print " " * indent + " ".join(text) + print(" " * indent + " ".join(text)) def display(self, indent=0): self.display_indent(indent, "Dom") diff --git a/keepnote/gui/richtext/undo_handler.py b/keepnote/gui/richtext/undo_handler.py index 5310bc7a9..f7ef1bd93 100644 --- a/keepnote/gui/richtext/undo_handler.py +++ b/keepnote/gui/richtext/undo_handler.py @@ -5,26 +5,7 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# keepnote imports +# keepnote.py imports from keepnote.undo import UndoStack from keepnote.listening import Listeners @@ -193,11 +174,8 @@ def _record_range(self): # TODO: I can probably discard iter's. Maybe make argument to # iter_buffer_contents - self.contents = filter( - lambda (kind, it, param): - kind in ("begin", "end") and param == self.tag, - buffer_contents_iter_to_offset( - iter_buffer_contents(self.textbuffer, start, end))) + self.contents = [kind_it_param for kind_it_param in buffer_contents_iter_to_offset( + iter_buffer_contents(self.textbuffer, start, end)) if kind_it_param[0] in ("begin", "end") and kind_it_param[2] == self.tag] #============================================================================= @@ -217,7 +195,7 @@ def on_insert_text(self, textbuffer, it, text, length): """Callback for text insert""" # NOTE: GTK does not give us a proper UTF string, so fix it - text = unicode(text, "utf_8") + text = str(text, "utf_8") length = len(text) # setup next action diff --git a/keepnote/gui/tabbed_viewer.py b/keepnote/gui/tabbed_viewer.py index 75daff3fe..f575355f3 100644 --- a/keepnote/gui/tabbed_viewer.py +++ b/keepnote/gui/tabbed_viewer.py @@ -1,51 +1,21 @@ -""" - - KeepNote - Tabbed Viewer for KeepNote. - -""" - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gobject - -# keepnote imports +# PyGObject imports +from gi import require_version + +require_version('Gtk', '4.0') +from gi.repository import Gtk, Gdk, GLib, GObject + +# KeepNote imports import keepnote -from keepnote.gui import \ - add_actions, Action +from keepnote.gui import add_actions, Action from keepnote.gui.three_pane_viewer import ThreePaneViewer from keepnote.gui.viewer import Viewer from keepnote.gui.icons import get_node_icon - _ = keepnote.translate -class TwoWayDict (object): - +class TwoWayDict(object): def __init__(self): - self._lookup1 = {} self._lookup2 = {} @@ -60,13 +30,15 @@ def get2(self, item2, default=None): return self._lookup2.get(item2, default) -class TabbedViewer (Viewer): +class TabbedViewer(Viewer): """A viewer with a treeview, listview, and editor""" - def __init__(self, app, main_window, viewerid=None, - default_viewer=ThreePaneViewer): - Viewer.__init__(self, app, main_window, viewerid, - viewer_name="tabbed_viewer") + def __init__(self, app, main_window, viewerid=None, default_viewer=ThreePaneViewer): + super().__init__(app, main_window, viewerid, viewer_name="tabbed_viewer") + self._app = app # Ensure _app is passed correctly + if self._app is None: + print("ERROR: _app is not initialized.") + return # Prevent further initialization if _app is None self._default_viewer = default_viewer self._current_viewer = None self._callbacks = {} @@ -74,76 +46,107 @@ def __init__(self, app, main_window, viewerid=None, self._null_viewer = Viewer(app, main_window) self._tab_names = {} - # TODO: move to the app? - # viewer registry + # Viewer registry self._viewer_lookup = TwoWayDict() - self._viewer_lookup.add(ThreePaneViewer(app, main_window).get_name(), - ThreePaneViewer) - - # layout - self._tabs = gtk.Notebook() - self._tabs.show() - self._tabs.set_property("show-border", False) - self._tabs.set_property("homogeneous", True) - self._tabs.set_property("scrollable", True) + # self._viewer_lookup.add(ThreePaneViewer(app, main_window).get_name(), ThreePaneViewer) + self._viewer_lookup.add("three_pane_viewer", ThreePaneViewer) + self._viewer_pages = {} # key: widget, value: viewer + + # Layout + self._tabs = Gtk.Notebook() + self._tabs.set_show_border(False) + self._tabs.set_scrollable(True) self._tabs.connect("switch-page", self._on_switch_tab) self._tabs.connect("page-added", self._on_tab_added) self._tabs.connect("page-removed", self._on_tab_removed) - self._tabs.connect("button-press-event", self._on_button_press) - self.pack_start(self._tabs, True, True, 0) - # initialize with a single tab - self.new_tab() + # Replace "button-press-event" with Gtk.GestureClick + click_controller = Gtk.GestureClick.new() + click_controller.set_button(1) # Left-click + click_controller.connect("pressed", self._on_button_press) + self._tabs.add_controller(click_controller) + + # self.append(self._tabs) # Changed from pack_start to append + if self._tabs.get_parent(): + print("⚠️ self._tabs already has a parent, unparenting it") + self._tabs.unparent() + print("➕ Appending self._tabs to TabbedViewer") + self.append(self._tabs) - # TODO: maybe add close_viewer() function + # Initialize with a single tab + self.new_tab() def get_current_viewer(self): """Get currently focused viewer""" pos = self._tabs.get_current_page() if pos == -1: return self._null_viewer - else: - return self._tabs.get_nth_page(pos) + return self._tabs.get_nth_page(pos) def iter_viewers(self): """Iterate through all viewers""" - for i in xrange(self._tabs.get_n_pages()): + for i in range(self._tabs.get_n_pages()): yield self._tabs.get_nth_page(i) def new_tab(self, viewer=None, init="current_node"): """Open a new tab with a viewer""" - - # TODO: make new tab appear next to existing tab - - # create viewer and add to notebook + self._current_viewer = viewer if viewer is None: viewer = self._default_viewer(self._app, self._main_window) - label = TabLabel(self, viewer, None, _("(Untitled)")) - label.connect("new-name", lambda w, text: - self._on_new_tab_name(viewer, text)) - self._tabs.append_page(viewer, label) - self._tabs.set_tab_reorderable(viewer, True) - self._tab_names[viewer] = None - viewer.show_all() + self._current_viewer = viewer # 修复 viewer 的引用丢失 + widget = viewer.get_widget() + if widget.get_parent(): + print("⚠️ new_tab(): viewer widget already has parent, unparenting") + widget.unparent() + + import uuid + label_text = "Notebook %s" % str(uuid.uuid4())[:8] + print("🧪 [DEBUG] Generated label:", label_text) + label = Gtk.Label(label=label_text) + # label = TabLabel(self, viewer, None, label_text) # 暂时禁用 + # label = Gtk.Label(label=label_text) # ✅ 用纯 label 测试结构是否稳定 + # label.connect("new-name", lambda w, text: self._on_new_tab_name(viewer, text)) + if hasattr(label, "connect") and "new-name" in GObject.signal_list_names(type(label)): + label.connect("new-name", lambda w, text: self._on_new_tab_name(viewer, text)) + + self._current_viewer = viewer # ✅ 保存 viewer 引用 + + widget = viewer.get_widget() + if widget is None: + print("❌ ERROR: viewer.get_widget() is None!") + return + if widget.get_parent(): + print("⚠️ new_tab(): viewer widget already has parent, unparenting") + widget.unparent() - # setup viewer signals + if not hasattr(viewer, "get_widget"): + print("❌ Error: viewer is not a Viewer instance") + return + + self._tabs.append_page(widget, label) + self._tabs.set_tab_reorderable(widget, True) # ✅ 改为操作 widget 而不是 viewer + self._tab_names[viewer] = None + # self._tabs.append_page(widget, label) + # self._tabs.set_tab_reorderable(widget, True) + # self._tab_names[viewer] = None + self._viewer_pages[widget] = viewer # ✅ 记录真实 viewer + # Setup viewer signals self._callbacks[viewer] = [ viewer.connect("error", lambda w, m, e: self.emit("error", m, e)), - viewer.connect("status", lambda w, m, b: - self.emit("status", m, b)), - viewer.connect("window-request", lambda w, t: - self.emit("window-request", t)), + viewer.connect("status", lambda w, m, b: self.emit("status", m, b)), + viewer.connect("window-request", lambda w, t: self.emit("window-request", t)), viewer.connect("current-node", self.on_tab_current_node), - viewer.connect("modified", self.on_tab_modified)] + viewer.connect("modified", self.on_tab_modified) + ] - # load app pref - viewer.load_preferences(self._app.pref, True) + # Load app preferences + if hasattr(viewer, "load_preferences"): + viewer.load_preferences(self._app.pref, True) - # set notebook and node, if requested + # Set notebook and node, if requested if init == "current_node": - # replicate current view old_viewer = self._current_viewer - if old_viewer is not None: + if old_viewer is not None and hasattr(old_viewer, "get_notebook"): viewer.set_notebook(old_viewer.get_notebook()) node = old_viewer.get_current_node() if node: @@ -153,24 +156,25 @@ def new_tab(self, viewer=None, init="current_node"): else: raise Exception("unknown init") - # switch to the new tab + # Switch to the new tab self._tabs.set_current_page(self._tabs.get_n_pages() - 1) + print("🧪 [TAB] viewer id:", id(viewer)) + print("🧪 [TAB] widget id:", id(widget), "widget type:", type(widget)) + print("🧪 [TAB] label id:", id(label), "label text:", label.get_text() if hasattr(label, "get_text") else "") def close_viewer(self, viewer): self.close_tab(self._tabs.page_num(viewer)) def close_tab(self, pos=None): """Close a tab""" - # do not close last tab if self._tabs.get_n_pages() <= 1: return - # determine tab to close if pos is None: pos = self._tabs.get_current_page() viewer = self._tabs.get_nth_page(pos) - # clean up viewer + # Clean up viewer viewer.set_notebook(None) for callid in self._callbacks[viewer]: viewer.disconnect(callid) @@ -178,12 +182,11 @@ def close_tab(self, pos=None): del self._tab_names[viewer] self._main_window.remove_viewer(viewer) - # clean up possible ui + # Clean up UI if pos == self._tabs.get_current_page(): viewer.remove_ui(self._main_window) self._current_viewer = None - # perform removal from notebook self._tabs.remove_page(pos) def _on_switch_tab(self, tabs, page, page_num): @@ -192,38 +195,29 @@ def _on_switch_tab(self, tabs, page, page_num): self._current_viewer = self._tabs.get_nth_page(page_num) return - # remove old tab ui if self._current_viewer: self._current_viewer.remove_ui(self._main_window) - # add new tab ui self._current_viewer = self._tabs.get_nth_page(page_num) self._current_viewer.add_ui(self._main_window) - # notify listeners of new current tab def func(): self.emit("current-node", self._current_viewer.get_current_node()) notebook = self._current_viewer.get_notebook() - if notebook: - self.emit("modified", notebook.save_needed()) - else: - self.emit("modified", False) - gobject.idle_add(func) + self.emit("modified", notebook.save_needed() if notebook else False) + + GLib.idle_add(func) def _on_tab_added(self, tabs, child, page_num): """Callback when a tab is added""" - # ensure that tabs are shown if npages > 1, else hidden self._tabs.set_show_tabs(self._tabs.get_n_pages() > 1) def _on_tab_removed(self, tabs, child, page_num): - """Callback when a tab is added""" - # ensure that tabs are shown if npages > 1, else hidden + """Callback when a tab is removed""" self._tabs.set_show_tabs(self._tabs.get_n_pages() > 1) def on_tab_current_node(self, viewer, node): """Callback for when a viewer wants to set its title""" - - # get node title if node is None: if viewer.get_notebook(): title = viewer.get_notebook().get_attr("title", "") @@ -235,24 +229,19 @@ def on_tab_current_node(self, viewer, node): title = node.get_attr("title", "") icon = get_node_icon(node, expand=False) - # truncate title MAX_TITLE = 20 if len(title) > MAX_TITLE - 3: - title = title[:MAX_TITLE-3] + "..." + title = title[:MAX_TITLE - 3] + "..." - # set tab label with node title tab = self._tabs.get_tab_label(viewer) if self._tab_names[viewer] is None: - # only update tab title if it does not have a name already tab.set_text(title) tab.set_icon(icon) - # propogate current-node signal self.emit("current-node", node) def on_tab_modified(self, viewer, modified): """Callback for when viewer contains modified data""" - # propogate modified signal self.emit("modified", modified) def switch_tab(self, step): @@ -261,358 +250,270 @@ def switch_tab(self, step): pos = (pos + step) % self._tabs.get_n_pages() self._tabs.set_current_page(pos) - def _on_button_press(self, widget, event): + def _on_button_press(self, gesture, n_press, x, y): + """Callback for double-click on tab bar""" if (self.get_toplevel().get_focus() == self._tabs and - event.button == 1 and event.type == gtk.gdk._2BUTTON_PRESS): - # double click, start tab name editing - label = self._tabs.get_tab_label(self._tabs.get_nth_page( - self._tabs.get_current_page())) + n_press == 2): # Double-click + label = self._tabs.get_tab_label(self._tabs.get_nth_page(self._tabs.get_current_page())) label.start_editing() + gesture.set_state(Gtk.EventSequenceState.CLAIMED) def _on_new_tab_name(self, viewer, name): """Callback for when a tab gets a new name""" if name == "": name = None self._tab_names[viewer] = name - if name is None: self.on_tab_current_node(viewer, viewer.get_current_node()) - #============================================== - + # Viewer Methods def set_notebook(self, notebook): """Set the notebook for the viewer""" if notebook is None: - # clear the notebook in the viewer return self._current_viewer.set_notebook(notebook) - # restore saved tabs - tabs = notebook.pref.get("viewers", "ids", self._viewerid, - "tabs", default=[]) - - if len(tabs) == 0: - # no tabs to restore + tabs = notebook.pref.get("viewers", "ids", self._viewerid, "tabs", default=[]) + if not tabs: if self._current_viewer.get_notebook(): - # create one new tab self.new_tab(init="none") return self._current_viewer.set_notebook(notebook) for tab in tabs: - # TODO: add check for unknown type viewer_type = self._viewer_lookup.get1(tab.get("viewer_type", "")) viewer = self._current_viewer - if viewer.get_notebook() or type(viewer) != viewer_type: - # create new tab if notebook already loaded or - # viewer type does not match - viewer = ( - viewer_type(self._app, self._main_window, - tab.get("viewerid", None)) - if viewer_type else None) + viewer = viewer_type(self._app, self._main_window, tab.get("viewerid", None)) if viewer_type else None self.new_tab(viewer, init="none") else: - # no notebook loaded, so adopt viewerid viewer.set_id(tab.get("viewerid", None)) - # set notebook and node viewer.set_notebook(notebook) - - # set tab name name = tab.get("name", "") if name: self._tab_names[viewer] = name self._tabs.get_tab_label(viewer).set_text(name) - # set tab focus - current_id = notebook.pref.get( - "viewers", "ids", self._viewerid, - "current_viewer", default="") + current_id = notebook.pref.get("viewers", "ids", self._viewerid, "current_viewer", default="") for i, viewer in enumerate(self.iter_viewers()): if viewer.get_id() == current_id: self._tabs.set_current_page(i) break def get_notebook(self): - return self._current_viewer.get_notebook() + page = self._tabs.get_nth_page(self._tabs.get_current_page()) + viewer = self._viewer_pages.get(page) + if viewer is None: + print("⚠️ get_notebook(): viewer not found for page") + return None - def close_notebook(self, notebook): + if viewer is not None and hasattr(viewer, "get_notebook"): + return viewer.get_notebook() + else: + print("⚠️ get_notebook(): viewer not found or invalid") + return None - # progate close notebook + def close_notebook(self, notebook): closed_tabs = [] for i, viewer in enumerate(self.iter_viewers()): notebook2 = viewer.get_notebook() viewer.close_notebook(notebook) - if notebook2 is not None and viewer.get_notebook() is None: closed_tabs.append(i) - # close tabs for pos in reversed(closed_tabs): self.close_tab(pos) def load_preferences(self, app_pref, first_open=False): - """Load application preferences""" - for viewer in self.iter_viewers(): - viewer.load_preferences(app_pref, first_open) + for widget in self._viewer_pages: + viewer = self._viewer_pages[widget] + if hasattr(viewer, "load_preferences"): + viewer.load_preferences(app_pref, first_open) def save_preferences(self, app_pref): - """Save application preferences""" - # TODO: loop through all viewers to save app_pref self._current_viewer.save_preferences(app_pref) def save(self): - """Save the current notebook""" notebooks = set() - for viewer in self.iter_viewers(): viewer.save() - - # add to list of all notebooks notebook = viewer.get_notebook() if notebook: notebooks.add(notebook) - # clear tab info for all open notebooks for notebook in notebooks: - tabs = notebook.pref.get("viewers", "ids", self._viewerid, "tabs", - default=[]) + tabs = notebook.pref.get("viewers", "ids", self._viewerid, "tabs", default=[]) tabs[:] = [] current_viewer = self._current_viewer - - # record tab info for viewer in self.iter_viewers(): notebook = viewer.get_notebook() if notebook: - tabs = notebook.pref.get( - "viewers", "ids", self._viewerid, "tabs") - #node = viewer.get_current_node() + tabs = notebook.pref.get("viewers", "ids", self._viewerid, "tabs") name = self._tab_names[viewer] - tabs.append( - {"viewer_type": viewer.get_name(), - "viewerid": viewer.get_id(), - "name": name if name is not None else ""}) - - # mark current viewer + tabs.append({"viewer_type": viewer.get_name(), "viewerid": viewer.get_id(), + "name": name if name is not None else ""}) if viewer == current_viewer: - notebook.pref.set("viewers", "ids", self._viewerid, - "current_viewer", viewer.get_id()) + notebook.pref.set("viewers", "ids", self._viewerid, "current_viewer", viewer.get_id()) def undo(self): - """Undo the last action in the viewer""" return self._current_viewer.undo() def redo(self): - """Redo the last action in the viewer""" return self._current_viewer.redo() def get_editor(self): return self._current_viewer.get_editor() - #=============================================== - # node operations - def new_node(self, kind, pos, parent=None): return self._current_viewer.new_node(kind, pos, parent) def get_current_node(self): - """Returns the currently focused page""" return self._current_viewer.get_current_node() def get_selected_nodes(self): - """ - Returns (nodes, widget) where 'nodes' are a list of selected nodes - in widget 'widget' - """ return self._current_viewer.get_selected_nodes() def goto_node(self, node, direct=False): - """Move view focus to a particular node""" return self._current_viewer.goto_node(node, direct) def visit_history(self, offset): - """Visit a node in the viewer's history""" self._current_viewer.visit_history(offset) - #============================================ - # Search - def start_search_result(self): - """Start a new search result""" return self._current_viewer.start_search_result() def add_search_result(self, node): - """Add a search result""" return self._current_viewer.add_search_result(node) def end_search_result(self): - """Start a new search result""" return self._current_viewer.end_search_result() - #=========================================== - # ui - def add_ui(self, window): - """Add the view's UI to a window""" assert window == self._main_window self._ui_ready = True - self._action_group = gtk.ActionGroup("Tabbed Viewer") - self._uis = [] - add_actions(self._action_group, self._get_actions()) - self._main_window.get_uimanager().insert_action_group( - self._action_group, 0) - - for s in self._get_ui(): - self._uis.append( - self._main_window.get_uimanager().add_ui_from_string(s)) + # Note: Gtk.UIManager is deprecated in GTK 4, this needs reimplementation + print("Warning: add_ui needs to be reimplemented for GTK 4 (Gtk.UIManager deprecated)") + page = self._tabs.get_nth_page(self._tabs.get_current_page()) + viewer = self._viewer_pages.get(page) - self._current_viewer.add_ui(window) + if viewer is not None and hasattr(viewer, "add_ui"): + viewer.add_ui(window) + else: + print("⚠️ No valid viewer found for add_ui()") def remove_ui(self, window): - """Remove the view's UI from a window""" assert window == self._main_window self._ui_ready = False self._current_viewer.remove_ui(window) - - for ui in reversed(self._uis): - self._main_window.get_uimanager().remove_ui(ui) - self._uis = [] - - self._main_window.get_uimanager().remove_action_group( - self._action_group) + # Note: Gtk.UIManager is deprecated in GTK 4, this needs reimplementation + print("Warning: remove_ui needs to be reimplemented for GTK 4 (Gtk.UIManager deprecated)") def _get_ui(self): - - return [""" - - - - - - - - - - - - - - - - - - - - - -"""] + # Placeholder for GTK 4 GMenu or manual widget implementation + print("Warning: _get_ui needs to be reimplemented for GTK 4") + return [] def _get_actions(self): - - actions = map(lambda x: Action(*x), [ - ("New Tab", None, _("New _Tab"), - "T", _("Open a new tab"), - lambda w: self.new_tab()), - ("Close Tab", None, _("Close _Tab"), - "W", _("Close a tab"), - lambda w: self.close_tab()), - ("Next Tab", None, _("_Next Tab"), - "Page_Down", _("Switch to next tab"), + return [Action(*x) for x in [ + ("New Tab", None, _("New _Tab"), "T", _("Open a new tab"), lambda w: self.new_tab()), + ("Close Tab", None, _("Close _Tab"), "W", _("Close a tab"), lambda w: self.close_tab()), + ("Next Tab", None, _("_Next Tab"), "Page_Down", _("Switch to next tab"), lambda w: self.switch_tab(1)), - ("Previous Tab", None, _("_Previous Tab"), - "Page_Up", _("Switch to previous tab"), + ("Previous Tab", None, _("_Previous Tab"), "Page_Up", _("Switch to previous tab"), lambda w: self.switch_tab(-1)) + ]] - ]) - return actions -class TabLabel (gtk.HBox): +class TabLabel(Gtk.Box): + __gsignals__ = { + "new-name": (GObject.SIGNAL_RUN_LAST, None, (str,)), + } def __init__(self, tabs, viewer, icon, text): - gtk.HBox.__init__(self, False, 2) - - #self.name = None + super().__init__(orientation=Gtk.Orientation.HORIZONTAL, spacing=2) self.tabs = tabs self.viewer = viewer - # icon - self.icon = gtk.Image() + # Icon + self.icon = Gtk.Image() if icon: self.icon.set_from_pixbuf(icon) - self.icon.show() - - # label - self.label = gtk.Label(text) - self.label.set_alignment(0, .5) - self.label.show() - - # entry - self.entry = gtk.Entry() - self.entry.set_alignment(0) - self.entry.connect("focus-out-event", lambda w, e: self.stop_editing()) - self.entry.connect("editing-done", self._done) - self._editing = False + self.icon.set_visible(True) # Replaces show() + + # Label + self.label = Gtk.Label(label=text) + self.label.set_halign(Gtk.Align.START) + self.label.set_valign(Gtk.Align.CENTER) + self.label.set_visible(True) # Replaces show() - # close button - self.close_button_state = [gtk.STATE_NORMAL] + # Entry + self.entry = Gtk.Entry() + self.entry.set_halign(Gtk.Align.START) - def highlight(w, state): - self.close_button_state[0] = w.get_state() - w.set_state(state) + # Replace "focus-out-event" with EventControllerFocus + focus_controller = Gtk.EventControllerFocus.new() + focus_controller.connect("leave", lambda controller: self.stop_editing()) + self.entry.add_controller(focus_controller) - self.eclose_button = gtk.EventBox() + self.entry.connect("activate", self._done) + self._editing = False + + # Close button with hover effects using EventControllerMotion + self.eclose_button = Gtk.Box() self.close_button = keepnote.gui.get_resource_image("close_tab.png") - self.eclose_button.add(self.close_button) - self.eclose_button.show() - - self.close_button.set_alignment(0, .5) - self.eclose_button.connect( - "enter-notify-event", - lambda w, e: highlight(w, gtk.STATE_PRELIGHT)) - self.eclose_button.connect( - "leave-notify-event", - lambda w, e: highlight(w, self.close_button_state[0])) - self.close_button.show() - - self.eclose_button.connect("button-press-event", lambda w, e: - self.tabs.close_viewer(self.viewer) - if e.button == 1 else None) - - # layout - self.pack_start(self.icon, False, False, 0) - self.pack_start(self.label, True, True, 0) - self.pack_start(self.eclose_button, False, False, 0) + self.eclose_button.append(self.close_button) # Changed from add to set_child + self.eclose_button.set_visible(True) # Replaces show() + self.close_button.set_visible(True) # Replaces show() + + # Replace "enter-notify-event" and "leave-notify-event" with EventControllerMotion + motion_controller = Gtk.EventControllerMotion.new() + motion_controller.connect("enter", + lambda controller, x, y: self.close_button.set_state_flags(Gtk.StateFlags.PRELIGHT, + clear=False)) + motion_controller.connect("leave", lambda controller: self.close_button.set_state_flags(Gtk.StateFlags.NORMAL, + clear=True)) + self.eclose_button.add_controller(motion_controller) + + # Replace "button-press-event" with GestureClick + click_controller = Gtk.GestureClick.new() + click_controller.set_button(1) # Left-click + click_controller.connect("pressed", lambda gesture, n_press, x, y: self.tabs.close_viewer(self.viewer)) + self.eclose_button.add_controller(click_controller) + + # Layout + self.append(self.icon) # Changed from pack_start to append + self.append(self.label) # Changed from pack_start to append + self.append(self.eclose_button) # Changed from pack_start to append def _done(self, widget): - text = self.entry.get_text() self.stop_editing() self.label.set_label(text) self.emit("new-name", text) def start_editing(self): - if not self._editing: self._editing = True - w, h = self.label.get_child_requisition() + # In GTK 4, get_preferred_size() is replaced with measure() + width = self.label.measure(Gtk.Orientation.HORIZONTAL, -1)[1] # Minimum width + height = self.label.measure(Gtk.Orientation.VERTICAL, -1)[1] # Minimum height self.remove(self.label) self.entry.set_text(self.label.get_label()) - self.pack_start(self.entry, True, True, 0) + self.append(self.entry) # Changed from pack_start to append self.reorder_child(self.entry, 1) - self.entry.set_size_request(w, h) - self.entry.show() + self.entry.set_size_request(int(width), int(height)) + self.entry.set_visible(True) # Replaces show() self.entry.grab_focus() - self.entry.start_editing(gtk.gdk.Event(gtk.gdk.NOTHING)) def stop_editing(self): if self._editing: self._editing = False self.remove(self.entry) - self.pack_start(self.label, True, True, 0) + self.append(self.label) # Changed from pack_start to append self.reorder_child(self.label, 1) - self.label.show() + self.label.set_visible(True) # Replaces show() def set_text(self, text): if not self._editing: @@ -622,6 +523,7 @@ def set_icon(self, pixbuf): self.icon.set_from_pixbuf(pixbuf) -gobject.type_register(TabLabel) -gobject.signal_new("new-name", TabLabel, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) + + +GObject.type_register(TabLabel) +# GObject.signal_new("new-name", TabLabel, GObject.SignalFlags.RUN_LAST, None, (str,)) \ No newline at end of file diff --git a/keepnote/gui/three_pane_viewer.py b/keepnote/gui/three_pane_viewer.py index 9b897e816..80c260383 100644 --- a/keepnote/gui/three_pane_viewer.py +++ b/keepnote/gui/three_pane_viewer.py @@ -1,43 +1,13 @@ -""" - - KeepNote - Classic three-paned viewer for KeepNote. - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gobject -import gtk - -# keepnote imports +# PyGObject imports +from gi import require_version + +require_version('Gtk', '4.0') +from gi.repository import Gtk, Gdk, Gio, GObject + +# KeepNote imports import keepnote from keepnote.notebook import NoteBookError -from keepnote.gui import \ - add_actions, \ - Action, \ - CONTEXT_MENU_ACCEL_PATH, \ - DEFAULT_COLORS +from keepnote.gui import add_actions, Action, CONTEXT_MENU_ACCEL_PATH, DEFAULT_COLORS from keepnote import notebook as notebooklib from keepnote.gui import richtext from keepnote.gui.richtext import RichTextError @@ -51,770 +21,549 @@ from keepnote.gui.icons import lookup_icon_filename from keepnote.gui.colortool import ColorMenu - _ = keepnote.translate - DEFAULT_VSASH_POS = 200 DEFAULT_HSASH_POS = 200 DEFAULT_VIEW_MODE = "vertical" -class ThreePaneViewer (Viewer): +class ThreePaneViewer(Viewer): """A viewer with a treeview, listview, and editor""" def __init__(self, app, main_window, viewerid=None): - Viewer.__init__(self, app, main_window, viewerid, - viewer_name="three_pane_viewer") + super().__init__(app, main_window, viewerid, viewer_name="three_pane_viewer") self._ui_ready = False - - # node selections - self._current_page = None # current page in editor - self._treeview_sel_nodes = [] # current selected nodes in treeview - self._queue_list_select = [] # nodes to select in listview after - # treeview change + self._uis = [] + self._current_page = None + self._treeview_sel_nodes = [] + self._queue_list_select = [] self._new_page_occurred = False self.back_button = None self._view_mode = DEFAULT_VIEW_MODE - + self._app = app # Ensure _app is assigned here + if self._app is None: + print("ERROR: _app is not initialized.") + return # Prevent further initialization if _app is None self.connect("history-changed", self._on_history_changed) - #========================================= - # widgets - - # treeview self.treeview = KeepNoteTreeView() - self.treeview.set_get_node(self._app.get_node) + if self._app is not None: # Ensure _app is not None before using it + self.treeview.set_get_node(self._app.get_node) + else: + print("ERROR: _app is not initialized.") self.treeview.connect("select-nodes", self._on_tree_select) self.treeview.connect("delete-node", self.on_delete_node) - self.treeview.connect("error", lambda w, t, e: - self.emit("error", t, e)) + self.treeview.connect("error", lambda w, t, e: self.emit("error", t, e)) self.treeview.connect("edit-node", self._on_edit_node) self.treeview.connect("goto-node", self.on_goto_node) self.treeview.connect("activate-node", self.on_activate_node) self.treeview.connect("drop-file", self._on_attach_file) - # listview self.listview = KeepNoteListView() - self.listview.set_get_node(self._app.get_node) + # self.listview.set_get_node(self._app.get_node) + if self._app is not None: # Ensure _app is not None before using it + self.listview.set_get_node(self._app.get_node) + else: + print("ERROR: _app is not initialized.") self.listview.connect("select-nodes", self._on_list_select) self.listview.connect("delete-node", self.on_delete_node) self.listview.connect("goto-node", self.on_goto_node) self.listview.connect("activate-node", self.on_activate_node) - self.listview.connect("goto-parent-node", - lambda w: self.on_goto_parent_node()) - self.listview.connect("error", lambda w, t, e: - self.emit("error", t, e)) + self.listview.connect("goto-parent-node", lambda w: self.on_goto_parent_node()) + self.listview.connect("error", lambda w, t, e: self.emit("error", t, e)) self.listview.connect("edit-node", self._on_edit_node) self.listview.connect("drop-file", self._on_attach_file) - self.listview.on_status = self.set_status # TODO: clean up + self.listview.on_status = self.set_status - # editor - #self.editor = KeepNoteEditor(self._app) - #self.editor = RichTextEditor(self._app) self.editor = ContentEditor(self._app) rich_editor = RichTextEditor(self._app) self.editor.add_editor("text/xhtml+xml", rich_editor) - self.editor.add_editor("text", TextEditor(self._app)) - self.editor.set_default_editor(rich_editor) - - self.editor.connect("view-node", self._on_editor_view_node) - self.editor.connect("child-activated", self._on_child_activated) - self.editor.connect("visit-node", lambda w, n: - self.goto_node(n, False)) - self.editor.connect("error", lambda w, t, e: self.emit("error", t, e)) - self.editor.connect("window-request", lambda w, t: - self.emit("window-request", t)) - self.editor.view_nodes([]) - - self.editor_pane = gtk.VBox(False, 5) - self.editor_pane.pack_start(self.editor, True, True, 0) - - #===================================== - # layout - - # TODO: make sure to add underscore for these variables - - # create a horizontal paned widget - self.hpaned = gtk.HPaned() - self.pack_start(self.hpaned, True, True, 0) - self.hpaned.set_position(DEFAULT_HSASH_POS) - - # layout major widgets - self.paned2 = gtk.VPaned() - self.hpaned.add2(self.paned2) - self.paned2.set_position(DEFAULT_VSASH_POS) - - # treeview and scrollbars - sw = gtk.ScrolledWindow() - sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - sw.set_shadow_type(gtk.SHADOW_IN) - sw.add(self.treeview) - self.hpaned.add1(sw) - - # listview with scrollbars - self.listview_sw = gtk.ScrolledWindow() - self.listview_sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self.listview_sw.set_shadow_type(gtk.SHADOW_IN) - self.listview_sw.add(self.listview) - self.paned2.add1(self.listview_sw) - #self.paned2.child_set_property(self.listview_sw, "shrink", True) - - # layout editor - self.paned2.add2(self.editor_pane) + self.editor.add_editor("text/plain", TextEditor(self._app)) - self.treeview.grab_focus() + self._listview_sw = Gtk.ScrolledWindow() + self._listview_sw.set_child(self.listview) + + self.editor_pane = self.editor.get_widget() + + self._paned2 = Gtk.Paned.new(Gtk.Orientation.VERTICAL) + self._paned2.set_start_child(self._listview_sw) + self._paned2.set_end_child(self.editor_pane) + + self._treeview_sw = Gtk.ScrolledWindow() + self._treeview_sw.set_child(self.treeview) + + self._hpaned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL) + self._hpaned.set_start_child(self._treeview_sw) + self._hpaned.set_end_child(self._paned2) + + # self.widget = self._hpaned + self._ui_ready = True def set_notebook(self, notebook): - """Set the notebook for the viewer""" - # add/remove reference to notebook self._app.ref_notebook(notebook) if self._notebook is not None: self._app.unref_notebook(self._notebook) - # deregister last notebook, if it exists if self._notebook: - self._notebook.node_changed.remove( - self.on_notebook_node_changed) + self._notebook.node_changed.remove(self.on_notebook_node_changed) - # setup listeners if notebook: notebook.node_changed.add(self.on_notebook_node_changed) - # set notebook self._notebook = notebook self.editor.set_notebook(notebook) self.listview.set_notebook(notebook) self.treeview.set_notebook(notebook) if self.treeview.get_popup_menu(): - self.treeview.get_popup_menu().iconmenu.set_notebook(notebook) - self.listview.get_popup_menu().iconmenu.set_notebook(notebook) - - colors = (self._notebook.pref.get("colors", default=DEFAULT_COLORS) - if self._notebook else DEFAULT_COLORS) + # self.treeview.get_popup_menu().set_parent(self.treeview) + popup = self.treeview.get_popup_menu() + if popup.get_parent() is not None: + popup.unparent() + popup.set_parent(self.treeview) + + # self.listview.get_popup_menu().set_parent(self.listview) + popup = self.listview.get_popup_menu() + if popup.get_parent() is not None: + popup.unparent() + popup.set_parent(self.listview) + + colors = self._notebook.pref.get("colors", default=DEFAULT_COLORS) if self._notebook else DEFAULT_COLORS self.treeview.get_popup_menu().fgcolor_menu.set_colors(colors) self.treeview.get_popup_menu().bgcolor_menu.set_colors(colors) self.listview.get_popup_menu().fgcolor_menu.set_colors(colors) self.listview.get_popup_menu().bgcolor_menu.set_colors(colors) - # restore selections self._load_selections() - - # put focus on treeview self.treeview.grab_focus() def load_preferences(self, app_pref, first_open=False): - """Load application preferences""" - p = app_pref.get("viewers", "three_pane_viewer", define=True) + viewers_pref = app_pref.get("viewers", {}) + if not isinstance(viewers_pref, dict): + print("[warn] config 'viewers' expected dict but got", type(viewers_pref)) + viewers_pref = {} + p = viewers_pref.get("three_pane_viewer", {}) + + vsash_pos = p.get("vsash_pos", DEFAULT_VSASH_POS) + hsash_pos = p.get("hsash_pos", DEFAULT_HSASH_POS) + print(f"vsash_pos: {vsash_pos} (type: {type(vsash_pos)})") + print(f"hsash_pos: {hsash_pos} (type: {type(hsash_pos)})") self.set_view_mode(p.get("view_mode", DEFAULT_VIEW_MODE)) - self.paned2.set_property("position-set", True) - self.hpaned.set_property("position-set", True) - self.paned2.set_position(p.get("vsash_pos", DEFAULT_VSASH_POS)) - self.hpaned.set_position(p.get("hsash_pos", DEFAULT_HSASH_POS)) + self._paned2.set_property("position-set", True) + self._hpaned.set_property("position-set", True) + self._paned2.set_position(int(vsash_pos)) + self._hpaned.set_position(int(hsash_pos)) self.listview.load_preferences(app_pref, first_open) - - try: - # if this version of GTK doesn't have tree-lines, ignore it - self.treeview.set_property( - "enable-tree-lines", - app_pref.get("look_and_feel", "treeview_lines", default=True)) - except: - pass - self.editor.load_preferences(app_pref, first_open) - - # reload ui if self._ui_ready: self.remove_ui(self._main_window) self.add_ui(self._main_window) + def get_widget(self): + return self._hpaned def save_preferences(self, app_pref): - """Save application preferences""" p = app_pref.get("viewers", "three_pane_viewer") p["view_mode"] = self._view_mode - p["vsash_pos"] = self.paned2.get_position() - p["hsash_pos"] = self.hpaned.get_position() + p["vsash_pos"] = self._paned2.get_position() + p["hsash_pos"] = self._hpaned.get_position() self.listview.save_preferences(app_pref) self.editor.save_preferences(app_pref) def save(self): - """Save the current notebook""" self.listview.save() self.editor.save() self._save_selections() def on_notebook_node_changed(self, nodes): - """Callback for when notebook node is changed""" self.emit("modified", True) def undo(self): - """Undo the last action in the viewer""" self.editor.undo() def redo(self): - """Redo the last action in the viewer""" self.editor.redo() def get_editor(self): - """Returns node editor""" return self.editor.get_editor() def set_status(self, text, bar="status"): - """Set a status message""" self.emit("status", text, bar) def set_view_mode(self, mode): - """ - Sets view mode for ThreePaneViewer - - modes: - "vertical" - "horizontal" - """ - vsash = self.paned2.get_position() - - # detach widgets - self.paned2.remove(self.listview_sw) - self.paned2.remove(self.editor_pane) - self.hpaned.remove(self.paned2) + vsash = self._paned2.get_position() + if self._paned2.get_start_child() == self._listview_sw: + self._paned2.set_start_child(None) + elif self._paned2.get_end_child() == self._listview_sw: + self._paned2.set_end_child(None) + + if self._paned2.get_start_child() == self.editor_pane: + self._paned2.set_start_child(None) + elif self._paned2.get_end_child() == self.editor_pane: + self._paned2.set_end_child(None) + + if self._hpaned.get_start_child() == self._paned2: + self._hpaned.set_start_child(None) + elif self._hpaned.get_end_child() == self._paned2: + self._hpaned.set_end_child(None) - # remake paned2 if mode == "vertical": - # create a vertical paned widget - self.paned2 = gtk.VPaned() + self._paned2 = Gtk.Paned(orientation=Gtk.Orientation.VERTICAL) else: - # create a horizontal paned widget - self.paned2 = gtk.HPaned() + self._paned2 = Gtk.Paned(orientation=Gtk.Orientation.HORIZONTAL) - self.paned2.set_position(vsash) - self.paned2.show() + self._paned2.set_position(vsash) + self._paned2.show() + self._hpaned.set_end_child(self._paned2) - self.hpaned.add2(self.paned2) - self.hpaned.show() - - self.paned2.add1(self.listview_sw) - self.paned2.add2(self.editor_pane) - - # record preference + self._hpaned.show() + self._paned2.set_end_child(self._listview_sw) + self._paned2.set_end_child(self.editor_pane) self._view_mode = mode def _load_selections(self): - """Load previous node selections from notebook preferences""" if self._notebook: - info = self._notebook.pref.get("viewers", "ids", - self._viewerid, define=True) - - # load selections - nodes = [node for node in ( - self._notebook.get_node_by_id(i) - for i in info.get("selected_treeview_nodes", [])) - if node is not None] + info = self._notebook.pref.get("viewers", "ids", self._viewerid, define=True) + nodes = [node for node in (self._notebook.get_node_by_id(i) for i in info.get("selected_treeview_nodes", [])) if node is not None] + if not nodes: # If no saved selection, select the root node + nodes = [self._notebook] # Select the notebook root self.treeview.select_nodes(nodes) - nodes = [node for node in ( - self._notebook.get_node_by_id(i) - for i in info.get("selected_listview_nodes", [])) - if node is not None] - + nodes = [node for node in (self._notebook.get_node_by_id(i) for i in info.get("selected_listview_nodes", [])) if node is not None] self.listview.select_nodes(nodes) def _save_selections(self): - """Save node selections into notebook preferences""" if self._notebook is not None: - info = self._notebook.pref.get("viewers", "ids", - self._viewerid, define=True) - - # save selections - info["selected_treeview_nodes"] = [ - node.get_attr("nodeid") - for node in self.treeview.get_selected_nodes()] - info["selected_listview_nodes"] = [ - node.get_attr("nodeid") - for node in self.listview.get_selected_nodes()] + info = self._notebook.pref.get("viewers", "ids", self._viewerid, define=True) + info["selected_treeview_nodes"] = [node.get_attr("nodeid") for node in self.treeview.get_selected_nodes()] + info["selected_listview_nodes"] = [node.get_attr("nodeid") for node in self.listview.get_selected_nodes()] self._notebook.set_preferences_dirty() - #=============================================== - # node operations - def get_current_node(self): - """Returns the currently focused page""" return self._current_page def get_selected_nodes(self): - """ - Returns a list of selected nodes. - """ if self.treeview.is_focus(): return self.treeview.get_selected_nodes() - else: - nodes = self.listview.get_selected_nodes() - if len(nodes) == 0: - return self.treeview.get_selected_nodes() - else: - return nodes + nodes = self.listview.get_selected_nodes() + return nodes if nodes else self.treeview.get_selected_nodes() def _on_history_changed(self, viewer, history): - """Callback for when node browse history changes""" if self._ui_ready and self.back_button: self.back_button.set_sensitive(history.has_back()) self.forward_button.set_sensitive(history.has_forward()) def get_focused_widget(self, default=None): - """Returns the currently focused widget""" if self.treeview.is_focus(): return self.treeview if self.listview.is_focus(): return self.listview - else: - return default + return default def on_delete_node(self, widget, nodes=None): - """Callback for deleting a node""" - # get node to delete if nodes is None: nodes = self.get_selected_nodes() - - if len(nodes) == 0: + if not nodes: return if self._main_window.confirm_delete_nodes(nodes): - # change selection if len(nodes) == 1: node = nodes[0] widget = self.get_focused_widget(self.listview) parent = node.get_parent() children = parent.get_children() i = children.index(node) - - if i < len(children) - 1: - widget.select_nodes([children[i+1]]) - else: - widget.select_nodes([parent]) + widget.select_nodes([children[i+1]] if i < len(children) - 1 else [parent]) else: widget = self.get_focused_widget(self.listview) widget.select_nodes([]) - # perform delete try: for node in nodes: node.trash() - except NoteBookError, e: + except NoteBookError as e: self.emit("error", e.msg, e) def _on_editor_view_node(self, editor, node): - """Callback for when editor views a node""" - # record node in history self._history.add(node.get_attr("nodeid")) self.emit("history-changed", self._history) def _on_child_activated(self, editor, textview, child): - """Callback for when child widget in editor is activated""" if self._current_page and isinstance(child, richtext.RichTextImage): filename = self._current_page.get_file(child.get_filename()) self._app.run_external_app("image_viewer", filename) def _on_tree_select(self, treeview, nodes): - """Callback for treeview selection change""" - # do nothing if selection is unchanged + print(f"Tree select triggered with nodes: {[node.get_title() for node in nodes]}") if self._treeview_sel_nodes == nodes: return - - # remember which nodes are selected in the treeview self._treeview_sel_nodes = nodes - - # view the children of these nodes in the listview self.listview.view_nodes(nodes) - - # if nodes are queued for selection in listview (via goto parent) - # then select them here - if len(self._queue_list_select) > 0: + if self._queue_list_select: self.listview.select_nodes(self._queue_list_select) self._queue_list_select = [] - - # make sure nodes are also selected in listview self.listview.select_nodes(nodes) def _on_list_select(self, listview, nodes): - """Callback for listview selection change""" - # remember the selected node - if len(nodes) == 1: - self._current_page = nodes[0] - else: - self._current_page = None - + self._current_page = nodes[0] if len(nodes) == 1 else None try: self.editor.view_nodes(nodes) - except RichTextError, e: - self.emit("error", - "Could not load page '%s'." % nodes[0].get_title(), e) - + except RichTextError as e: + self.emit("error", f"Could not load page '{nodes[0].get_title()}'.", e) self.emit("current-node", self._current_page) def on_goto_node(self, widget, node): - """Focus view on a node""" self.goto_node(node, direct=False) def on_activate_node(self, widget, node): - """Focus view on a node""" if self.viewing_search(): - # if we are in a search, goto node, but not directly self.goto_node(node, direct=False) + elif node and node.has_attr("payload_filename"): + self._main_window.on_view_node_external_app("file_launcher", node, kind="file") else: - if node and node.has_attr("payload_filename"): - # open attached file - self._main_window.on_view_node_external_app("file_launcher", - node, - kind="file") - else: - # goto node directly - self.goto_node(node, direct=True) + self.goto_node(node, direct=True) def on_goto_parent_node(self, node=None): - """Focus view on a node's parent""" if node is None: nodes = self.get_selected_nodes() - if len(nodes) == 0: + if not nodes: return node = nodes[0] - - # get parent parent = node.get_parent() - if parent is not None: + if parent: self.goto_node(parent, direct=False) def _on_edit_node(self, widget, node, attr, value): - """Callback for title edit finishing""" - # move cursor to editor after new page has been created if self._new_page_occurred: self._new_page_occurred = False - if node.get_attr("content_type") != notebooklib.CONTENT_TYPE_DIR: self.goto_editor() def _on_attach_file(self, widget, parent, index, uri): - """Attach document""" self._app.attach_file(uri, parent, index) def _on_attach_file_menu(self): - """Callback for attach file action""" - nodes = self.get_selected_nodes() - if len(nodes) > 0: - node = nodes[0] - self._app.on_attach_file(node, self.get_toplevel()) + if nodes: + self._app.on_attach_file(nodes[0], self.get_toplevel()) def new_node(self, kind, pos, parent=None): - """Add a new node to the notebook""" - - # TODO: think about where this goes - if self._notebook is None: return - self.treeview.cancel_editing() self.listview.cancel_editing() - if parent is None: nodes = self.get_selected_nodes() - if len(nodes) == 1: - parent = nodes[0] - else: - parent = self._notebook - + parent = nodes[0] if len(nodes) == 1 else self._notebook node = Viewer.new_node(self, kind, pos, parent) - self._view_new_node(node) def on_new_dir(self): - """Add new folder near selected nodes""" self.new_node(notebooklib.CONTENT_TYPE_DIR, "sibling") def on_new_page(self): - """Add new page near selected nodes""" self.new_node(notebooklib.CONTENT_TYPE_PAGE, "sibling") def on_new_child_page(self): - """Add new page as child of selected nodes""" self.new_node(notebooklib.CONTENT_TYPE_PAGE, "child") def _view_new_node(self, node): - """View a node particular widget""" - self._new_page_occurred = True - self.goto_node(node) - if node in self.treeview.get_selected_nodes(): self.treeview.edit_node(node) else: self.listview.edit_node(node) def _on_rename_node(self): - """Callback for renaming a node""" nodes = self.get_selected_nodes() - - if len(nodes) == 0: - return - - widget = self.get_focused_widget(self.listview) - widget.edit_node(nodes[0]) + if nodes: + widget = self.get_focused_widget(self.listview) + widget.edit_node(nodes[0]) def goto_node(self, node, direct=False): - """Move view focus to a particular node""" - if node is None: - # default node is the one selected in the listview nodes = self.listview.get_selected_nodes() - if len(nodes) == 0: + if not nodes: return node = nodes[0] if direct: - # direct goto: open up treeview all the way to the node self.treeview.select_nodes([node]) else: - # indirect goto: do not open up treeview, only listview - treenodes = self.treeview.get_selected_nodes() - - # get path to root path = [] ptr = node while ptr: if ptr in treenodes: - # if parent path is already selected then quit path = [] break path.append(ptr) ptr = ptr.get_parent() - # find first node that is collapsed node2 = None - for node2 in reversed(path): - if not self.treeview.is_node_expanded(node2): + for n in reversed(path): + if not self.treeview.is_node_expanded(n): + node2 = n break - # make selections if node2: self.treeview.select_nodes([node2]) - - # This test might be needed for windows crash if node2 != node: self.listview.select_nodes([node]) def goto_next_node(self): - """Move focus to the 'next' node""" - widget = self.get_focused_widget(self.treeview) path, col = widget.get_cursor() - if path: path2 = path[:-1] + (path[-1] + 1,) - - if len(path) > 1: - it = widget.get_model().get_iter(path[:-1]) - nchildren = widget.get_model().iter_n_children(it) - else: - nchildren = widget.get_model().iter_n_children(None) - + nchildren = widget.get_model().iter_n_children(widget.get_model().get_iter(path[:-1]) if len(path) > 1 else None) if path2[-1] < nchildren: widget.set_cursor(path2) def goto_prev_node(self): - """Move focus to the 'previous' node""" widget = self.get_focused_widget(self.treeview) path, col = widget.get_cursor() - if path and path[-1] > 0: path2 = path[:-1] + (path[-1] - 1,) widget.set_cursor(path2) def expand_node(self, all=False): - """Expand the tree beneath the focused node""" widget = self.get_focused_widget(self.treeview) path, col = widget.get_cursor() - if path: widget.expand_row(path, all) def collapse_node(self, all=False): - """Collapse the tree beneath the focused node""" widget = self.get_focused_widget(self.treeview) path, col = widget.get_cursor() - if path: if all: - # recursively collapse all notes widget.collapse_all_beneath(path) else: widget.collapse_row(path) def on_copy_tree(self): - """Callback for copy on whole tree""" widget = self._main_window.get_focus() - if gobject.signal_lookup("copy-tree-clipboard", widget) != 0: + if GObject.signal_lookup("copy-tree-clipboard", widget): widget.emit("copy-tree-clipboard") - #============================================ - # Search - def start_search_result(self): - """Start a new search result""" self.treeview.select_nodes([]) self.listview.view_nodes([], nested=False) def add_search_result(self, node): - """Add a search result""" self.listview.append_node(node) def end_search_result(self): - """End a search result""" - - # select top result try: self.listview.get_selection().select_path((0,)) except: - # don't worry if there isn't anything to select pass def viewing_search(self): - """Returns True if we are currently viewing a search result""" - return (len(self.treeview.get_selected_nodes()) == 0 and - len(self.listview.get_selected_nodes()) > 0) - - #============================================= - # Goto functions + return len(self.treeview.get_selected_nodes()) == 0 and len(self.listview.get_selected_nodes()) > 0 def goto_treeview(self): - """Switch focus to TreeView""" self.treeview.grab_focus() def goto_listview(self): - """Switch focus to ListView""" self.listview.grab_focus() def goto_editor(self): - """Switch focus to Editor""" self.editor.grab_focus() - #=========================================== - # ui - def add_ui(self, window): - """Add the view's UI to a window""" - assert window == self._main_window - self._ui_ready = True - self._action_group = gtk.ActionGroup("Viewer") + self._action_group = Gio.SimpleActionGroup() self._uis = [] - add_actions(self._action_group, self._get_actions()) - self._main_window.get_uimanager().insert_action_group( - self._action_group, 0) - for s in self._get_ui(): - self._uis.append( - self._main_window.get_uimanager().add_ui_from_string(s)) + # Add actions to the action group + for action_data in self._get_actions(): + action_name = action_data['name'].lower().replace(" ", "-") + simple_action = Gio.SimpleAction.new(action_name, None) + simple_action.connect("activate", action_data['callback']) + self._action_group.add_action(simple_action) + + self._main_window.insert_action_group("viewer", self._action_group) - uimanager = self._main_window.get_uimanager() - uimanager.ensure_update() + # Create toolbar + toolbar = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) + self.back_button = Gtk.Button(label=_("Back")) + self.back_button.connect("clicked", lambda w: self.visit_history(-1)) + self.forward_button = Gtk.Button(label=_("Forward")) + self.forward_button.connect("clicked", lambda w: self.visit_history(1)) + toolbar.append(self.back_button) + toolbar.append(self.forward_button) - # setup toolbar - self.back_button = uimanager.get_widget("/main_tool_bar/Viewer/Back") - self.forward_button = uimanager.get_widget( - "/main_tool_bar/Viewer/Forward") + # Note: You'll need to add this toolbar to your main window + # e.g., self._main_window.set_header_bar(toolbar) or similar - # setup editor self.editor.add_ui(window) - # TODO: Try to add accellerator to popup menu - #menu = viewer.editor.get_textview().get_popup_menu() - #menu.set_accel_group(self._accel_group) - #menu.set_accel_path(CONTEXT_MENU_ACCEL_PATH) - - # treeview context menu - menu1 = uimanager.get_widget( - "/popup_menus/treeview_popup").get_submenu() - self.treeview.set_popup_menu(menu1) - menu1.set_accel_path(CONTEXT_MENU_ACCEL_PATH) - menu1.set_accel_group(uimanager.get_accel_group()) - - # treeview icon menu - menu1.iconmenu = self._setup_icon_menu() - item = uimanager.get_widget( - "/popup_menus/treeview_popup/Change Note Icon") - item.set_submenu(menu1.iconmenu) - item.show() - - # treeview fg color menu - menu1.fgcolor_menu = self._setup_color_menu("fg") - item = uimanager.get_widget( - "/popup_menus/treeview_popup/Change Fg Color") - item.set_submenu(menu1.fgcolor_menu) - item.show() - - # treeview bg color menu - menu1.bgcolor_menu = self._setup_color_menu("bg") - item = uimanager.get_widget( - "/popup_menus/treeview_popup/Change Bg Color") - item.set_submenu(menu1.bgcolor_menu) - item.show() - - # listview context menu - menu2 = uimanager.get_widget( - "/popup_menus/listview_popup").get_submenu() - self.listview.set_popup_menu(menu2) - menu2.set_accel_group(uimanager.get_accel_group()) - menu2.set_accel_path(CONTEXT_MENU_ACCEL_PATH) - - # listview icon menu - menu2.iconmenu = self._setup_icon_menu() - item = uimanager.get_widget( - "/popup_menus/listview_popup/Change Note Icon") - item.set_submenu(menu2.iconmenu) - item.show() - - # listview fg color menu - menu2.fgcolor_menu = self._setup_color_menu("fg") - item = uimanager.get_widget( - "/popup_menus/listview_popup/Change Fg Color") - item.set_submenu(menu2.fgcolor_menu) - item.show() - - # listview bg color menu - menu2.bgcolor_menu = self._setup_color_menu("bg") - item = uimanager.get_widget( - "/popup_menus/listview_popup/Change Bg Color") - item.set_submenu(menu2.bgcolor_menu) - item.show() + tree_menu = self._create_popup_menu("treeview") + self.treeview.set_popup_menu(tree_menu) + + list_menu = self._create_popup_menu("listview") + self.listview.set_popup_menu(list_menu) + + def remove_ui(self, window): + assert self._main_window == window + self._ui_ready = False + self.editor.remove_ui(self._main_window) + self._main_window.insert_action_group("viewer", None) + self._action_group = None + + def _create_popup_menu(self, menu_type): + menu = Gtk.PopoverMenu() + # 设置自定义属性 + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + + items = [ + ("New Page", self.on_new_page), + ("New Child Page", self.on_new_child_page), + ("New Folder", self.on_new_dir), + ("Attach File", self._on_attach_file_menu), + ("Delete Note", self.on_delete_node), + ("Rename Note", self._on_rename_node), + ] + + for label, callback in items: + button = Gtk.Button(label=_(label)) + button.connect("clicked", callback) + menu_box.append(button) + + icon_menu = self._setup_icon_menu() + color_fg_menu = self._setup_color_menu("fg") + color_bg_menu = self._setup_color_menu("bg") + + menu_box.append(icon_menu) + menu_box.append(color_fg_menu) + menu_box.append(color_bg_menu) + + menu.set_child(menu_box) + # menu.set_parent(self._main_window) # Set parent for proper positioning + if menu.get_parent() is not None: + menu.unparent() + menu.set_parent(self._main_window) # Set parent for proper positioning + # ✅ 添加这一行，把 fgcolor_menu 属性挂到 menu 上 + menu.fgcolor_menu = color_fg_menu + menu.bgcolor_menu = color_bg_menu + return menu def _setup_icon_menu(self): - """Setup the icon menu""" iconmenu = IconMenu() - iconmenu.connect( - "set-icon", - lambda w, i: self._app.on_set_icon( - i, u"", self.get_selected_nodes())) - iconmenu.new_icon.connect( - "activate", - lambda w: self._app.on_new_icon( - self.get_selected_nodes(), self._notebook, - self._main_window)) + iconmenu.connect("set-icon", lambda w, i: self._app.on_set_icon(i, "", self.get_selected_nodes())) + iconmenu.connect("new-icon-activated", lambda w: self._app.on_new_icon(self.get_selected_nodes(), self._notebook, self._main_window)) iconmenu.set_notebook(self._notebook) - return iconmenu def _setup_color_menu(self, kind): - """Setup the icon menu""" - def on_set_color(w, color): for node in self.get_selected_nodes(): - if kind == "fg": - attr = "title_fgcolor" - else: - attr = "title_bgcolor" + attr = "title_fgcolor" if kind == "fg" else "title_bgcolor" if color: node.set_attr(attr, color) else: @@ -823,47 +572,29 @@ def on_set_color(w, color): def on_set_colors(w, colors): if self._notebook: self._notebook.pref.set("colors", list(colors)) - self._app.get_listeners("colors_changed").notify( - self._notebook, colors) + self._app.get_listeners("colors_changed").notify(self._notebook, colors) def on_new_colors(notebook, colors): if self._notebook == notebook: menu.set_colors(colors) - colors = self._notebook.pref.get("colors", default=DEFAULT_COLORS) \ - if self._notebook else DEFAULT_COLORS - + colors = self._notebook.pref.get("colors", default=DEFAULT_COLORS) if self._notebook else DEFAULT_COLORS menu = ColorMenu(colors) - menu.connect("set-color", on_set_color) menu.connect("set-colors", on_set_colors) self._app.get_listeners("colors_changed").add(on_new_colors) - return menu - def remove_ui(self, window): - """Remove the view's UI from a window""" - - assert self._main_window == window - - self._ui_ready = False - self.editor.remove_ui(self._main_window) - - for ui in reversed(self._uis): - self._main_window.get_uimanager().remove_ui(ui) - self._uis = [] - - self._main_window.get_uimanager().ensure_update() - self._main_window.get_uimanager().remove_action_group( - self._action_group) - self._action_group = None + def visit_history(self, direction): + # This method needs to be implemented based on your history handling + # For now, here's a basic placeholder + if direction < 0 and self._history.has_back(): + self.goto_node(self._history.back()) + elif direction > 0 and self._history.has_forward(): + self.goto_node(self._history.forward()) def _get_ui(self): - """Returns the UI XML""" - - # NOTE: I use a dummy menubar popup_menus so that I can have - # accelerators on the menus. It is a hack. - + # This method is kept for reference but not used in GTK 4 version return [""" @@ -874,7 +605,6 @@ def _get_ui(self):
- @@ -882,7 +612,6 @@ def _get_ui(self): - @@ -915,7 +644,6 @@ def _get_ui(self): - @@ -927,8 +655,6 @@ def _get_ui(self): - - @@ -954,7 +680,6 @@ def _get_ui(self): - @@ -983,106 +708,45 @@ def _get_ui(self): - """] def _get_actions(self): - """Returns actions for view's UI""" - - return map(lambda x: Action(*x), [ - - ("treeview_popup", None, "", "", None, lambda w: None), - ("listview_popup", None, "", "", None, lambda w: None), - - ("Copy Tree", gtk.STOCK_COPY, _("Copy _Tree"), - "C", _("Copy entire tree"), - lambda w: self.on_copy_tree()), - - ("New Page", gtk.STOCK_NEW, _("New _Page"), - "N", _("Create a new page"), - lambda w: self.on_new_page(), "note-new.png"), - - ("New Child Page", gtk.STOCK_NEW, _("New _Child Page"), - "N", _("Create a new child page"), - lambda w: self.on_new_child_page(), - "note-new.png"), - - ("New Folder", gtk.STOCK_DIRECTORY, _("New _Folder"), - "M", _("Create a new folder"), - lambda w: self.on_new_dir(), - "folder-new.png"), - - ("Attach File", gtk.STOCK_ADD, _("_Attach File..."), - "", _("Attach a file to the notebook"), - lambda w: self._on_attach_file_menu()), - - - ("Back", gtk.STOCK_GO_BACK, _("_Back"), "", None, - lambda w: self.visit_history(-1)), - - ("Forward", gtk.STOCK_GO_FORWARD, _("_Forward"), "", None, - lambda w: self.visit_history(1)), - - ("Go to Note", gtk.STOCK_JUMP_TO, _("Go to _Note"), - "", None, - lambda w: self.on_goto_node(None, None)), - - ("Go to Parent Note", gtk.STOCK_GO_BACK, _("Go to _Parent Note"), - "Left", None, - lambda w: self.on_goto_parent_node()), - - ("Go to Next Note", gtk.STOCK_GO_DOWN, _("Go to Next N_ote"), - "Down", None, - lambda w: self.goto_next_node()), - - ("Go to Previous Note", gtk.STOCK_GO_UP, _("Go to _Previous Note"), - "Up", None, - lambda w: self.goto_prev_node()), - - ("Expand Note", gtk.STOCK_ADD, _("E_xpand Note"), - "Right", None, - lambda w: self.expand_node()), - - ("Collapse Note", gtk.STOCK_REMOVE, _("_Collapse Note"), - "Left", None, - lambda w: self.collapse_node()), - - ("Expand All Child Notes", gtk.STOCK_ADD, - _("Expand _All Child Notes"), - "Right", None, - lambda w: self.expand_node(True)), - - ("Collapse All Child Notes", gtk.STOCK_REMOVE, - _("Collapse A_ll Child Notes"), - "Left", None, - lambda w: self.collapse_node(True)), - - - ("Go to Tree View", None, _("Go to _Tree View"), - "T", None, - lambda w: self.goto_treeview()), - - ("Go to List View", None, _("Go to _List View"), - "Y", None, - lambda w: self.goto_listview()), - - ("Go to Editor", None, _("Go to _Editor"), - "D", None, - lambda w: self.goto_editor()), - - ("Delete Note", gtk.STOCK_DELETE, _("_Delete"), - "", None, self.on_delete_node), - - ("Rename Note", gtk.STOCK_EDIT, _("_Rename"), - "", None, - lambda w: self._on_rename_node()), - - ("Change Note Icon", None, _("_Change Note Icon"), - "", None, lambda w: None, - lookup_icon_filename(None, u"folder-red.png")), - - ("Change Fg Color", None, _("Change _Fg Color")), - - ("Change Bg Color", None, _("Change _Bg Color")), - ]) + # Return a list of dictionaries instead of Action objects + return [ + { + 'name': name, + 'stock_id': stock_id, + 'label': label, + 'accelerator': accelerator, + 'tooltip': tooltip, + 'callback': callback, + 'icon_filename': icon_filename + } for (name, stock_id, label, accelerator, tooltip, callback, *rest) in [ + ("treeview_popup", None, "", "", None, lambda w: None), + ("listview_popup", None, "", "", None, lambda w: None), + ("copy-tree", "gtk-copy", _("Copy _Tree"), "C", _("Copy entire tree"), lambda w: self.on_copy_tree()), + ("new-page", "gtk-new", _("New _Page"), "N", _("Create a new page"), lambda w: self.on_new_page(), "note-new.png"), + ("new-child-page", "gtk-new", _("New _Child Page"), "N", _("Create a new child page"), lambda w: self.on_new_child_page(), "note-new.png"), + ("new-folder", "gtk-directory", _("New _Folder"), "M", _("Create a new folder"), lambda w: self.on_new_dir(), "folder-new.png"), + ("attach-file", "gtk-add", _("_Attach File..."), "", _("Attach a file to the notebook"), lambda w: self._on_attach_file_menu()), + ("back", "gtk-go-back", _("_Back"), "", None, lambda w: self.visit_history(-1)), + ("forward", "gtk-go-forward", _("_Forward"), "", None, lambda w: self.visit_history(1)), + ("go-to-note", "gtk-jump-to", _("Go to _Note"), "", None, lambda w: self.on_goto_node(None, None)), + ("go-to-parent-note", "gtk-go-back", _("Go to _Parent Note"), "Left", None, lambda w: self.on_goto_parent_node()), + ("go-to-next-note", "gtk-go-down", _("Go to Next N_ote"), "Down", None, lambda w: self.goto_next_node()), + ("go-to-previous-note", "gtk-go-up", _("Go to _Previous Note"), "Up", None, lambda w: self.goto_prev_node()), + ("expand-note", "gtk-add", _("E_xpand Note"), "Right", None, lambda w: self.expand_node()), + ("collapse-note", "gtk-remove", _("_Collapse Note"), "Left", None, lambda w: self.collapse_node()), + ("expand-all-child-notes", "gtk-add", _("Expand _All Child Notes"), "Right", None, lambda w: self.expand_node(True)), + ("collapse-all-child-notes", "gtk-remove", _("Collapse A_ll Child Notes"), "Left", None, lambda w: self.collapse_node(True)), + ("go-to-tree-view", None, _("Go to _Tree View"), "T", None, lambda w: self.goto_treeview()), + ("go-to-list-view", None, _("Go to _List View"), "Y", None, lambda w: self.goto_listview()), + ("go-to-editor", None, _("Go to _Editor"), "D", None, lambda w: self.goto_editor()), + ("delete-note", "gtk-delete", _("_Delete"), "", None, self.on_delete_node), + ("rename-note", "gtk-edit", _("_Rename"), "", None, lambda w: self._on_rename_node()), + ("change-note-icon", None, _("_Change Note Icon"), "", None, lambda w: None, lookup_icon_filename(None, "folder-red.png")), + ("change-fg-color", None, _("Change _Fg Color"), "", None, lambda w: None), + ("change-bg-color", None, _("Change _Bg Color"), "", None, lambda w: None), + ] for icon_filename in rest or [None] + ] diff --git a/keepnote/gui/treemodel.py b/keepnote/gui/treemodel.py index 8ae86efdc..587924b0a 100644 --- a/keepnote/gui/treemodel.py +++ b/keepnote/gui/treemodel.py @@ -1,89 +1,44 @@ -""" - - KeepNote - Treemodel for treeview and listview - -""" - - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gobject -import gtk +# PyGObject imports +from gi import require_version +require_version('Gtk', '4.0') # GTK4 change +from gi.repository import GObject +from gi.repository import Gtk, GdkPixbuf # GTK4 change +import os +from keepnote import get_resource def get_path_from_node(model, node, node_col): """ Determine the path of a NoteBookNode 'node' in a gtk.TreeModel 'model' """ - - # NOTE: I must make no assumptions about the type of the model - # I could change that if I make a wrapper around TreeSortModel - if node is None: return () - # determine root set - root_set = {} - child = model.iter_children(None) - i = 0 - while child is not None: - root_set[model.get_value(child, node_col)] = i - child = model.iter_next(child) - i += 1 - - # walk up parent path until root set - node_path = [] - while node not in root_set: - node_path.append(node) - node = node.get_parent() - if node is None: - # node is not in the model (e.g. listview subset) - return None - - # walk back down and record path - path = [root_set[node]] - it = model.get_iter(tuple(path)) - for node in reversed(node_path): - child = model.iter_children(it) - i = 0 - - while child is not None: - if model.get_value(child, node_col) == node: - path.append(i) - it = child - break - child = model.iter_next(child) - i += 1 - else: - raise Exception("bad model") - - return tuple(path) - - -class TreeModelColumn (object): - + def find_iter(model, target_node, parent_iter=None): + """Recursively find the TreeIter for a given node""" + iter = model.iter_children(parent_iter) + while iter is not None: + current_node = model.get_value(iter, node_col) + if current_node == target_node: + return iter + # Recursively search children + child_iter = find_iter(model, target_node, iter) + if child_iter is not None: + return child_iter + iter = model.iter_next(iter) + return None + + # Find the TreeIter for the target node + target_iter = find_iter(model, node) + if target_iter is None: + return None # Node is not in the model + + # Get the path from the TreeIter + path = model.get_path(target_iter) + return tuple(path) # 转换为元组以保持兼容性 + + +class TreeModelColumn(object): def __init__(self, name, datatype, attr=None, get=lambda node: ""): self.pos = None self.name = name @@ -91,29 +46,19 @@ def __init__(self, name, datatype, attr=None, get=lambda node: ""): self.attr = attr self.get_value = get - def iter_children(model, it): """Iterate through the children of a row (it)""" - node = model.iter_children(it) while node: yield node node = model.iter_next(node) - -class BaseTreeModel (gtk.GenericTreeModel): - """ - TreeModel that wraps a subset of a NoteBook - - The subset is defined by the self._roots list. - """ - +class BaseTreeModel(Gtk.TreeStore): def __init__(self, roots=[]): - gtk.GenericTreeModel.__init__(self) - self.set_property("leak-references", False) - + super().__init__(object, str, GdkPixbuf.Pixbuf, str, str, GdkPixbuf.Pixbuf) # 6 列 self._notebook = None self._roots = [] + self._root_set = {} self._master_node = None self._nested = True @@ -123,52 +68,69 @@ def __init__(self, roots=[]): self.set_root_nodes(roots) - # add default node column - self.append_column(TreeModelColumn("node", object, - get=lambda node: node)) + self.append_column(TreeModelColumn("node", object, get=lambda node: node)) + self.append_column(TreeModelColumn("title", str, get=lambda node: node.get_title() if node else "")) + self.append_column(TreeModelColumn("icon", GdkPixbuf.Pixbuf, get=self._get_node_icon)) + self.append_column(TreeModelColumn("bgcolor", str, + get=lambda node: node.get_attr("background") if node and node.get_attr( + "background") else "")) + self.append_column(TreeModelColumn("fgcolor", str, + get=lambda node: node.get_attr("foreground") if node and node.get_attr( + "foreground") else "")) + self.append_column(TreeModelColumn("icon_open", GdkPixbuf.Pixbuf, get=self._get_expander_icon)) self.set_node_column(self.get_column_by_name("node")) + print(f"Initialized BaseTreeModel with {self.get_n_columns()} columns") - def set_notebook(self, notebook): - """ - Set the notebook for this model - A notebook must be set before any nodes can be added to the model - """ + def _get_expander_icon(self, node): + if not node or not node.has_children(): + return None + icon_name = node.get_attr("icon_open") or "folder-open.png" + try: + icon_path = get_resource("images", os.path.join("node_icons", icon_name)) + print(f"Loading expander icon from: {icon_path}") + return GdkPixbuf.Pixbuf.new_from_file_at_size(icon_path, 16, 16) + except Exception as e: + print(f"Failed to load expander icon {icon_name}: {e}") + return None - # unhook listeners for old notebook. if it exists + def set_notebook(self, notebook): if self._notebook is not None: self._notebook.node_changed.remove(self._on_node_changed) self._notebook = notebook - # attach new listeners for new notebook, if it exists if self._notebook: self._notebook.node_changed.add(self._on_node_changed) - #========================== - # column manipulation + def _get_node_icon(self, node): + if not node: + return None + icon_name = node.get_attr("icon") or "note.png" + try: + icon_path = get_resource("images", os.path.join("node_icons", icon_name)) + print(f"Loading icon from: {icon_path}") + return GdkPixbuf.Pixbuf.new_from_file_at_size(icon_path, 16, 16) + except Exception as e: + print(f"Failed to load icon {icon_name}: {e}") + return None + # Column manipulation def append_column(self, column): - """Append a new column to the treemodel""" assert column.name not in self._columns_lookup - column.pos = len(self._columns) self._columns.append(column) self._columns_lookup[column.name] = column def get_column(self, pos): - """Returns a column from a particular position""" return self._columns[pos] def get_columns(self): - """Returns list of columns in treemodel""" return self._columns def get_column_by_name(self, colname): - """Returns a columns with the given name""" return self._columns_lookup.get(colname, None) def add_column(self, name, coltype, get): - """Append column only if it does not already exist""" col = self.get_column_by_name(name) if col is None: col = TreeModelColumn(name, coltype, get=get) @@ -176,30 +138,15 @@ def add_column(self, name, coltype, get): return col def get_node_column_pos(self): - """Returns the column position containing node objects""" assert self._node_column is not None return self._node_column.pos def get_node_column(self): - """Returns the columns that conatins nodes""" return self._node_column def set_node_column(self, col): - """Set the column that contains nodes""" self._node_column = col - if gtk.gtk_version < (2, 10): - # NOTE: not available in pygtk 2.8? - - def create_tree_iter(self, node): - return self.get_iter(self.on_get_path(node)) - - def get_user_data(self, it): - return self.on_get_iter(self.get_path(it)) - - #================================ - # master nodes and root nodes - def set_master_node(self, node): self._master_node = node @@ -207,305 +154,135 @@ def get_master_node(self): return self._master_node def set_nested(self, nested): - """Sets the 'nested mode' of the treemodel""" self._nested = nested self.set_root_nodes(self._roots) def get_nested(self): - """Returns True if treemodel is in 'nested mode' - 'nested mode' means rows can have children. - """ return self._nested def clear(self): - """Clear all rows from model""" - for i in xrange(len(self._roots)-1, -1, -1): - self.row_deleted((i,)) - + super().clear() self._roots = [] self._root_set = {} def set_root_nodes(self, roots=[]): - """Set the root nodes of the model""" - # clear the model self.clear() - for node in roots: self.append(node) - - # we must have a notebook, so that we can react to NoteBook changes if len(roots) > 0: assert self._notebook is not None def get_root_nodes(self): - """Returns the root nodes of the treemodel""" return self._roots def append(self, node): - """Appends a node at the root level of the treemodel""" index = len(self._roots) self._root_set[node] = index self._roots.append(node) - rowref = self.create_tree_iter(node) - self.row_inserted((index,), rowref) - self.row_has_child_toggled((index,), rowref) + title = node.get_title() if node else "" + icon = self._get_node_icon(node) + bgcolor = node.get_attr("background") if node and node.get_attr("background") else None + fgcolor = node.get_attr("foreground") if node and node.get_attr("foreground") else None + icon_open = self._get_expander_icon(node) + rowref = super().append(None, [node, title, icon, bgcolor, fgcolor, icon_open]) + print( + f"Appending node={node}, title={title}, icon={icon}, bgcolor={bgcolor}, fgcolor={fgcolor}, icon_open={icon_open}, column count={self.get_n_columns()}") self.row_has_child_toggled((index,), rowref) - #============================== - # notebook callbacks - def _on_node_changed(self, actions): - """Callback for when a node changes""" - - # notify listeners that changes in the model will start to occur - nodes = [a[1] for a in actions if a[0] == "changed" or - a[0] == "changed-recurse"] + nodes = [a[1] for a in actions if a[0] in ("changed", "changed-recurse")] self.emit("node-changed-start", nodes) for action in actions: act = action[0] - - if (act == "changed" or act == "changed-recurse" or - act == "added"): - node = action[1] - else: - node = None + node = action[1] if act in ("changed", "changed-recurse", "added") else None if node and node == self._master_node: - # reset roots self.set_root_nodes(self._master_node.get_children()) - elif act == "changed-recurse": try: - path = self.on_get_path(node) + path = get_path_from_node(self, node, self.get_node_column_pos()) except: - continue # node is not part of model, ignore it - rowref = self.create_tree_iter(node) - # TODO: is it ok to create rowref before row_deleted? - - self.row_deleted(path) - self.row_inserted(path, rowref) + continue + self.remove(self.get_iter(path)) + rowref = self.append(None, [node]) self.row_has_child_toggled(path, rowref) - elif act == "added": try: - path = self.on_get_path(node) + path = get_path_from_node(self, node, self.get_node_column_pos()) except: - continue # node is not part of model, ignore it - rowref = self.create_tree_iter(node) - - self.row_inserted(path, rowref) + continue + rowref = self.append(None, [node]) parent = node.get_parent() if len(parent.get_children()) == 1: - rowref2 = self.create_tree_iter(parent) - self.row_has_child_toggled(path[:-1], rowref2) + parent_path = get_path_from_node(self, parent, self.get_node_column_pos()) + rowref2 = self.get_iter(parent_path) + self.row_has_child_toggled(parent_path, rowref2) self.row_has_child_toggled(path, rowref) - - elif act == "removed": + elif act == "act": parent = action[1] index = action[2] - try: - parent_path = self.on_get_path(parent) + parent_path = get_path_from_node(self, parent, self.get_node_column_pos()) except: - continue # node is not part of model, ignore it + continue path = parent_path + (index,) - - self.row_deleted(path) - rowref = self.create_tree_iter(parent) + self.remove(self.get_iter(path)) + rowref = self.get_iter(parent_path) if len(parent.get_children()) == 0: self.row_has_child_toggled(parent_path, rowref) - # notify listeners that changes in the model have ended self.emit("node-changed-end", nodes) - #===================================== - # gtk.GenericTreeModel implementation - - def on_get_flags(self): - """Returns the flags of this treemodel""" - return gtk.TREE_MODEL_ITERS_PERSIST - - def on_get_n_columns(self): - """Returns the number of columns in a treemodel""" - return len(self._columns) - - def on_get_column_type(self, index): - """Returns the type of a column in the treemodel""" - return self._columns[index].type - def on_get_iter(self, path): - """Returns the node of a path""" - if path[0] >= len(self._roots): + try: + return self.get_iter(path) + except ValueError: return None - node = self._roots[path[0]] - - for i in path[1:]: - if i >= len(node.get_children()): - print path - raise ValueError() - node = node.get_children()[i] - - return node - - def on_get_path(self, rowref): - """Returns the path of a rowref""" - if rowref is None: - return () - - path = [] - node = rowref - while node not in self._root_set: - path.append(node.get_attr("order")) - node = node.get_parent() - if node is None: - raise Exception("treeiter is not part of model") - path.append(self._root_set[node]) - - return tuple(reversed(path)) + def on_get_path(self, node): + return get_path_from_node(self, node, self.get_node_column_pos()) def on_get_value(self, rowref, column): - """Returns a value from a row in the treemodel""" - return self.get_column(column).get_value(rowref) - - def on_iter_next(self, rowref): - """Returns the next sibling of a rowref""" - parent = rowref.get_parent() - - if parent is None or rowref in self._root_set: - n = self._root_set[rowref] - if n >= len(self._roots) - 1: - return None - else: - return self._roots[n+1] - - children = parent.get_children() - order = rowref.get_attr("order") - assert 0 <= order < len(children) - - if order == len(children) - 1: - return None - else: - return children[order+1] - - def on_iter_children(self, parent): - """Returns the first child of a treeiter""" - if parent is None: - if len(self._roots) > 0: - return self._roots[0] - else: - return None - elif self._nested and len(parent.get_children()) > 0: - return parent.get_children()[0] - else: - return None - - def on_iter_has_child(self, rowref): - """Returns True of treeiter has children""" - return self._nested and rowref.has_children() - - def on_iter_n_children(self, rowref): - """Returns the number of children of a treeiter""" - if rowref is None: - return len(self._roots) - if not self._nested: - return 0 - - return len(rowref.get_children()) - - def on_iter_nth_child(self, parent, n): - """Returns the n'th child of a treeiter""" - if parent is None: - if n >= len(self._roots): - return None - else: - return self._roots[n] - elif not self._nested: + print(f"on_get_value: rowref={rowref}, requested column={column}, total columns={self.get_n_columns()}") + if column >= self.get_n_columns(): + print(f"Error: Column {column} exceeds defined columns {self.get_n_columns()}") return None - else: - children = parent.get_children() - if n >= len(children): - print "out of bounds", parent.get_title(), n - return None - else: - return children[n] - - def on_iter_parent(self, child): - """Returns the parent of a treeiter""" - if child in self._root_set: + node = self.get_value(rowref, 0) + col = self.get_column(column) + if col is None: + print(f"Error: No column definition for index {column}") return None - else: - parent = child.get_parent() - return parent - + value = col.get_value(node) + print(f"Returning value={value} for column={column}") + return value -gobject.type_register(BaseTreeModel) -gobject.signal_new("node-changed-start", BaseTreeModel, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("node-changed-end", BaseTreeModel, - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) +GObject.type_register(BaseTreeModel) +GObject.signal_new("node-changed-start", BaseTreeModel, GObject.SignalFlags.RUN_LAST, None, (object,)) +GObject.signal_new("node-changed-end", BaseTreeModel, GObject.SignalFlags.RUN_LAST, None, (object,)) - -class KeepNoteTreeModel (BaseTreeModel): - """ - TreeModel that wraps a subset of a NoteBook - - The subset is defined by the self._roots list. - """ - def __init__(self, roots=[]): - BaseTreeModel.__init__(self, roots) - - self.fades = set() - - # add default node column - #self.append_column(TreeModelColumn("node", object, - # get=lambda node: node)) - #self.set_node_column(self.get_column_by_name("node")) - - # TODO: move to treeviewer - # init default columns - #self.append_column( - # TreeModelColumn( - # "icon", gdk.Pixbuf, - # get=lambda node: get_node_icon(node, False, - # node in self.fades))) - #self.append_column( - # TreeModelColumn( - # "icon_open", gdk.Pixbuf, - # get=lambda node: get_node_icon(node, True, - # node in self.fades))) - #self.append_column( - # TreeModelColumn("title", str, - # attr="title", - # get=lambda node: node.get_attr("title"))) - #self.append_column( - # TreeModelColumn("title_sort", str, - # attr="title", - # get=lambda node: node.get_title().lower())) - #self.append_column( - # TreeModelColumn("created_time2", str, - # attr="created_time", - # get=lambda node: self.get_time_text(node, - # "created_time"))) - #self.append_column( - # TreeModelColumn("created_time2_sort", int, - # attr="created_time", - # get=lambda node: node.get_attr( - # "created_time", 0))) - #self.append_column( - # TreeModelColumn("modified_time", str, - # attr="modified_time", - # get=lambda node: self.get_time_text(node, - # "modified_time"))) - #self.append_column( - # TreeModelColumn( - # "modified_time_sort", int, - # attr="modified_time", - # get=lambda node: node.get_attr("modified_time", 0))) - #self.append_column( - # TreeModelColumn("order", int, - # attr="order", - # get=lambda node: node.get_attr("order"))) +class KeepNoteTreeModel(BaseTreeModel): + def __init__(self, notebook=None): + super().__init__() + self._notebook = notebook + if notebook: + self.set_root_nodes([notebook]) + + def _add_model_column(self, name): + if name not in self._columns_lookup: + col = TreeModelColumn(name, None, get=lambda node: None) + self._columns.append(col) + self._columns_lookup[name] = col + col.pos = self.get_column_pos(name) + return self._columns_lookup[name] + + def get_column_pos(self, name): + mapping = { + "node": 0, + "title": 1, + "icon": 2, + "bgcolor": 3, + "fgcolor": 4, + "icon_open": 5 + } + return mapping.get(name, -1) diff --git a/keepnote/gui/treeview.py b/keepnote/gui/treeview.py index 1843945a0..dab1820ac 100644 --- a/keepnote/gui/treeview.py +++ b/keepnote/gui/treeview.py @@ -1,127 +1,107 @@ -""" - - KeepNote - TreeView - -""" -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# pygtk imports -import pygtk -pygtk.require('2.0') -import gobject -import gtk - -# keepnote imports +# PyGObject imports +from gi import require_version +require_version('Gtk', '4.0') # GTK4 change +from gi.repository import Gtk, Gdk, GLib, GdkPixbuf # GTK4 change + +# KeepNote imports from keepnote.gui import treemodel from keepnote.gui import basetreeview +from keepnote.gui.icons import get_node_icon - -class KeepNoteTreeView (basetreeview.KeepNoteBaseTreeView): +class KeepNoteTreeView(basetreeview.KeepNoteBaseTreeView): """ TreeView widget for the KeepNote NoteBook """ def __init__(self): - basetreeview.KeepNoteBaseTreeView.__init__(self) + super().__init__() self._notebook = None - self.set_model(treemodel.KeepNoteTreeModel()) + # 使用自定义模型 + self.model = treemodel.KeepNoteTreeModel() + self.set_model(self.model) - # treeview signals - self.connect("key-release-event", self.on_key_released) - self.connect("button-press-event", self.on_button_press) + # Treeview signals + # GTK3 写法（不可用于 GTK4） + # self.connect("key-release-event", self.on_key_released) - # selection config - self.get_selection().set_mode(gtk.SELECTION_MULTIPLE) + # GTK4 推荐写法： + controller = Gtk.EventControllerKey() + controller.connect("key-released", self.on_key_released) + self.add_controller(controller) - self.set_headers_visible(False) + # Selection config + self.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) - # tree style - try: - # available only on gtk > 2.8 - self.set_property("enable-tree-lines", True) - except TypeError: - pass + # Tree style + self.set_headers_visible(False) + self.set_property("enable-tree-lines", True) # GTK4: 保留无效，仅用于向后兼容 self._setup_columns() self.set_sensitive(False) def _setup_columns(self): - self.clear_columns() if self._notebook is None: return - # create the treeview column - self.column = gtk.TreeViewColumn() + # 创建树视图列 + self.column = Gtk.TreeViewColumn() self.column.set_clickable(False) self.append_column(self.column) - self._add_model_column("title") - self._add_title_render(self.column, "title") - - # make treeview searchable + # 添加图标和标题渲染器 + renderer_pixbuf = Gtk.CellRendererPixbuf() + renderer_text = Gtk.CellRendererText() + self.column.pack_start(renderer_pixbuf, False) + self.column.pack_start(renderer_text, True) + + # 确保模型包含足够的列 + self._add_model_column("icon") # 图标列 + self._add_model_column("icon_open") # 展开时的图标列 + self._add_model_column("title") # 标题列 + self._add_model_column("fgcolor") # 前景色 + self._add_model_column("bgcolor") # 背景色 + + self.column.add_attribute(renderer_pixbuf, "pixbuf", self.model.get_column_by_name("icon").pos) + # GTK4 不再支持 pixbuf-expander-open，保留注释如下： + # self.column.add_attribute(renderer_pixbuf, "pixbuf-expander-open", self.model.get_column_by_name("icon_open").pos) + self.column.add_attribute(renderer_text, "text", self.model.get_column_by_name("title").pos) + self.column.add_attribute(renderer_text, "foreground", self.model.get_column_by_name("fgcolor").pos) + self.column.add_attribute(renderer_text, "cell-background", self.model.get_column_by_name("bgcolor").pos) + + # 使树视图可搜索 self.set_search_column(self.model.get_column_by_name("title").pos) - #self.set_fixed_height_mode(True) - - #============================================= - # gui callbacks def on_key_released(self, widget, event): """Process key presses""" - # no special processing while editing nodes if self.editing_path: return - if event.keyval == gtk.keysyms.Delete: + if event.keyval == Gdk.KEY_Delete: self.emit("delete-node", self.get_selected_nodes()) - self.stop_emission("key-release-event") + self.stop_emission_by_name("key-release-event") def on_button_press(self, widget, event): """Process context popup menu""" if event.button == 3: - # popup menu return self.popup_menu(event.x, event.y, event.button, event.time) - if event.button == 1 and event.type == gtk.gdk._2BUTTON_PRESS: + if event.button == 1 and event.type == Gdk.EventType._2BUTTON_PRESS: nodes = self.get_selected_nodes() - if len(nodes) > 0: - # double click --> goto node + if nodes: self.emit("activate-node", nodes[0]) - #============================================== - # actions - def set_notebook(self, notebook): basetreeview.KeepNoteBaseTreeView.set_notebook(self, notebook) if self._notebook is None: self.model.set_root_nodes([]) self.set_sensitive(False) - else: self.set_sensitive(True) - root = self._notebook model = self.model @@ -132,12 +112,12 @@ def set_notebook(self, notebook): self._setup_columns() if root.get_attr("expanded", True): - self.expand_to_path((0,)) + path = Gtk.TreePath.new_from_indices([0]) + self.expand_to_path(path) def edit_node(self, node): path = treemodel.get_path_from_node( self.model, node, self.rich_model.get_node_column_pos()) - gobject.idle_add(lambda: self.set_cursor_on_cell( + GLib.idle_add(lambda: self.set_cursor_on_cell( path, self.column, self.title_text, True)) - #gobject.idle_add(lambda: self.scroll_to_cell(path)) diff --git a/keepnote/gui/viewer.py b/keepnote/gui/viewer.py index 5fa153d8a..54f122930 100644 --- a/keepnote/gui/viewer.py +++ b/keepnote/gui/viewer.py @@ -1,39 +1,12 @@ -""" - - KeepNote - Base class for a viewer - -""" - -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports +# Python imports import uuid -# pygtk imports -import pygtk -pygtk.require('2.0') -import gtk -import gobject +# PyGObject imports +from gi import require_version +require_version('Gtk', '4.0') # GTK4 change +from gi.repository import Gtk, GObject, Gio # GTK4 change -# keepnote imports +# KeepNote imports import keepnote from keepnote.history import NodeHistory from keepnote import notebook as notebooklib @@ -41,26 +14,25 @@ _ = keepnote.translate -class Viewer (gtk.VBox): - +class Viewer(Gtk.Box): def __init__(self, app, parent, viewerid=None, viewer_name="viewer"): - gtk.VBox.__init__(self, False, 0) + super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=0) # GTK4 change self._app = app self._main_window = parent - self._viewerid = viewerid if viewerid else unicode(uuid.uuid4()) + self._viewerid = viewerid if viewerid else str(uuid.uuid4()) self._viewer_name = viewer_name self._notebook = None self._history = NodeHistory() - # register viewer + # Register viewer self._main_window.add_viewer(self) def get_id(self): return self._viewerid def set_id(self, viewerid): - self._viewerid = viewerid if viewerid else unicode(uuid.uuid4()) + self._viewerid = viewerid if viewerid else str(uuid.uuid4()) def get_name(self): return self._viewer_name @@ -95,9 +67,7 @@ def redo(self): def get_editor(self): return None - #======================== - # node interaction - + # Node interaction def get_current_node(self): return None @@ -105,7 +75,6 @@ def get_selected_nodes(self): return [] def new_node(self, kind, pos, parent=None): - if parent is None: parent = self._notebook @@ -139,9 +108,7 @@ def visit_history(self, offset): self.goto_node(node, False) self._history.end_suspend() - #=============================================== - # search - + # Search def start_search_result(self): pass @@ -151,9 +118,7 @@ def add_search_result(self, node): def end_search_result(self): pass - #================================================ # UI management - def add_ui(self, window): pass @@ -161,16 +126,10 @@ def remove_ui(self, window): pass -gobject.type_register(Viewer) -gobject.signal_new("error", Viewer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str, object)) -gobject.signal_new("status", Viewer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str, str)) -gobject.signal_new("history-changed", Viewer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) -gobject.signal_new("window-request", Viewer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (str,)) -gobject.signal_new("modified", Viewer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (bool,)) -gobject.signal_new("current-node", Viewer, gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, (object,)) +GObject.type_register(Viewer) +GObject.signal_new("error", Viewer, GObject.SignalFlags.RUN_LAST, None, (str, object)) +GObject.signal_new("status", Viewer, GObject.SignalFlags.RUN_LAST, None, (str, str)) +GObject.signal_new("history-changed", Viewer, GObject.SignalFlags.RUN_LAST, None, (object,)) +GObject.signal_new("window-request", Viewer, GObject.SignalFlags.RUN_LAST, None, (str,)) +GObject.signal_new("modified", Viewer, GObject.SignalFlags.RUN_LAST, None, (bool,)) +GObject.signal_new("current-node", Viewer, GObject.SignalFlags.RUN_LAST, None, (object,)) \ No newline at end of file diff --git a/keepnote/history.py b/keepnote/history.py index d438d9660..c150f293f 100644 --- a/keepnote/history.py +++ b/keepnote/history.py @@ -4,27 +4,6 @@ Node history data structure """ - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - class NodeHistory (object): """Data structure of node history""" diff --git a/keepnote/linked_list.py b/keepnote/linked_list.py index 0956bd6c6..d68563ad8 100644 --- a/keepnote/linked_list.py +++ b/keepnote/linked_list.py @@ -4,27 +4,6 @@ Linked list data structure """ - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - class LinkedNode (object): """A node in a doubly linked list""" diff --git a/keepnote/linked_tree.py b/keepnote/linked_tree.py index b86569092..4053bf5a2 100644 --- a/keepnote/linked_tree.py +++ b/keepnote/linked_tree.py @@ -4,27 +4,6 @@ A tree implemented with linked lists """ - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - class LinkedTreeNode (object): """A node in a linked list tree""" diff --git a/keepnote/listening.py b/keepnote/listening.py index 63e4755fd..6c7d33f3e 100644 --- a/keepnote/listening.py +++ b/keepnote/listening.py @@ -4,27 +4,6 @@ Listener (Observer) pattern """ - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - class Listeners (object): """Maintains a list of listeners (functions) that are called when the notify function is called. diff --git a/bin/keepnote b/keepnote/main old mode 100755 new mode 100644 similarity index 59% rename from bin/keepnote rename to keepnote/main index 65926b557..2d1356bad --- a/bin/keepnote +++ b/keepnote/main @@ -1,37 +1,15 @@ -#!/usr/bin/env python -# -# KeepNote - note-taking and organization -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# python imports -import exceptions +#!/usr/bin/env python3 + +# Python imports import sys import os from os.path import basename, dirname, realpath, join, isdir import time import optparse -import thread import threading import traceback - - -#============================================================================= +# ============================================================================= # KeepNote import """ @@ -40,81 +18,75 @@ Three ways to run KeepNote bin_path = os.path.dirname(sys.argv[0]) (1) directly from source dir - - pkgdir = bin_path + "../keepnote" + + pkgdir = bin_path + "../keepnote.py" basedir = pkgdir sys.path.append(pkgdir) - src/bin/keepnote - src/keepnote/__init__.py - src/keepnote/images - src/keepnote/rc + src/bin/keepnote.py + src/keepnote.py/__init__.py + src/keepnote.py/images + src/keepnote.py/rc (2) from installation location by setup.py - pkgdir = keepnote.get_basedir() + pkgdir = keepnote.py.get_basedir() basedir = pkgdir - prefix/bin/keepnote - prefix/lib/python-XXX/site-packages/keepnote/__init__.py - prefix/lib/python-XXX/site-packages/keepnote/images - prefix/lib/python-XXX/site-packages/keepnote/rc - + prefix/bin/keepnote.py + prefix/lib/python-XXX/site-packages/keepnote.py/__init__.py + prefix/lib/python-XXX/site-packages/keepnote.py/images + prefix/lib/python-XXX/site-packages/keepnote.py/rc + (3) windows py2exe dir pkgdir = bin_path basedir = bin_path - dir/keepnote.exe + dir/keepnote.py.exe dir/library.zip dir/images dir/rc - """ -# try to infer keepnote lib path from program path +# Try to infer keepnote.py lib path from program path pkgdir = dirname(dirname(realpath(sys.argv[0]))) -if os.path.exists(join(pkgdir, "keepnote", "__init__.py")): +if os.path.exists(join(pkgdir, "keepnote.py", "__init__.py")): sys.path.insert(0, pkgdir) import keepnote - # if this works we know we are running from src_path (1) + # If this works, we know we are running from src_path (1) basedir = keepnote.get_basedir() else: - # try to import from python path + # Try to import from python path import keepnote - - # sucessful import, therefore we are running with (2) or (3) - - # attempt to use basedir for (2) + + # Successful import, therefore we are running with (2) or (3) + + # Attempt to use basedir for (2) basedir = keepnote.get_basedir() - + if not isdir(join(basedir, "images")): - # we must be running (3) + # We must be running (3) basedir = dirname(realpath(sys.argv[0])) keepnote.set_basedir(basedir) - - - -#============================================================================= -# keepnote imports +# ============================================================================= +# KeepNote imports import keepnote from keepnote.commands import get_command_executor, CommandExecutor from keepnote.teefile import TeeFileStream import keepnote.compat.pref -_ = keepnote.translate - +_ = keepnote.translate -#============================================================================= -# command-line options +# ============================================================================= +# Command-line options -o = optparse.OptionParser(usage= - "%prog [options] [NOTEBOOK]") +o = optparse.OptionParser(usage="%prog [options] [NOTEBOOK]") o.set_defaults(default_notebook=True) o.add_option("-c", "--cmd", dest="cmd", action="store_true", @@ -149,29 +121,27 @@ o.add_option("-p", "--port", dest="port", help="use a specified port for listening to commands") -#============================================================================= +# ============================================================================= def start_error_log(show_errors): """Starts KeepNote error log""" - keepnote.init_error_log() - - # Test ability to write to file-like objects used to display errors. - # - if stderr is unavailable, create error message, else add to stream - # list. Do not exit. - # Note: this code-section is necessary to allow Linux-users the option of - # launching KeepNote from a *.desktop file without having it - # run in a terminal. In other words, 'Terminal=false' can be safely - # added to the *.desktop file; without this code, adding - # 'Terminal=false' to the *.desktop file causes KeepNote - # launch failure. - + + # Test ability to write to file-like objects used to display errors. + # - If stderr is unavailable, create error message, else add to stream list. + # Do not exit. + # Note: This code section is necessary to allow Linux users the option of + # launching KeepNote from a *.desktop file without having it run in a + # terminal. In other words, 'Terminal=false' can be safely added to the + # *.desktop file; without this code, adding 'Terminal=false' to the + # *.desktop file causes KeepNote launch failure. + stream_list = [] stderr_test_str = "\n" stderr_except_msg = "" - - if show_errors: - try: + + if show_errors: + try: sys.stderr.write(stderr_test_str) except IOError: formatted_msg = traceback.format_exc().splitlines() @@ -180,106 +150,94 @@ def start_error_log(show_errors): formatted_msg[-1], "\n"]) else: stream_list.append(sys.stderr) - - # if errorlog is unavailable, exit with error, else add to stream list. + + # If errorlog is unavailable, exit with error, else add to stream list. try: errorlog = open(keepnote.get_user_error_log(), "a") except IOError: sys.exit(traceback.print_exc()) else: stream_list.append(errorlog) - - # redirect stderr + # Redirect stderr sys.stderr = TeeFileStream(stream_list, autoflush=True) - - # write errorlog header + # Write errorlog header keepnote.print_error_log_header() keepnote.log_message(stderr_except_msg) def parse_argv(argv): """Parse arguments""" - - # set default arguments + # Set default arguments options = o.get_default_values() - if keepnote.get_platform() == "windows": + if keepnote.get_platform() == "windows": options.show_errors = False else: options.show_errors = True - # parse args and process - (options, args) = o.parse_args(argv[1:], options) + # Parse args and process + options, args = o.parse_args(argv[1:], options) return options, args def setup_threading(): """Initialize threading environment""" - - import gtk.gdk - import gobject + from gi.repository import Gdk, GLib if keepnote.get_platform() == "windows": - # HACK: keep gui thread active + # HACK: Keep GUI thread active def sleeper(): - time.sleep(.001) - return True # repeat timer - gobject.timeout_add(400, sleeper) + time.sleep(0.001) + return True # Repeat timer + GLib.timeout_add(400, sleeper) else: - gtk.gdk.threads_init() + Gdk.threads_init() -def gui_exec(function, *args, **kw): +def gui_exec(function, *args, **kwargs): """Execute a function in the GUI thread""" - - import gtk.gdk - import gobject + from gi.repository import Gdk, GLib sem = threading.Semaphore() sem.acquire() def idle_func(): - gtk.gdk.threads_enter() + Gdk.threads_enter() try: - function(*args, **kw) + function(*args, **kwargs) return False finally: - sem.release() # notify that command is done - gtk.gdk.threads_leave() - gobject.idle_add(idle_func) + sem.release() # Notify that command is done + Gdk.threads_leave() + + GLib.idle_add(idle_func) - # wait for command to execute + # Wait for command to execute sem.acquire() - def start_gui(argv, options, args, cmd_exec): import keepnote.gui + from gi.repository import Gtk - # pygtk imports - import pygtk - pygtk.require('2.0') - import gtk - - # setup threading environment + # Setup threading environment setup_threading() - # create app + # Create app app = keepnote.gui.KeepNote(basedir) app.init() cmd_exec.set_app(app) need_gui = execute_command(app, argv) - - # begin gtk event loop + + # Begin GTK event loop if need_gui: - gtk.main() + Gtk.main() def start_non_gui(argv, options, args, cmd_exec): - - # read preferences + # Read preferences app = keepnote.KeepNote(basedir) app.init() cmd_exec.set_app(app) @@ -290,26 +248,22 @@ def execute_command(app, argv): """ Execute commands given on command line - Returns True if gui event loop should be started + Returns True if GUI event loop should be started """ - options, args = parse_argv(argv) - #------------------------------------------ - # process builtin commands + # Process builtin commands if options.list_cmd: list_commands(app) return False - + if options.info: keepnote.print_runtime_info(sys.stdout) return False - - #------------------------------------------ - # process extended commands + # Process extended commands if options.cmd: - # process application command (AppCommand) + # Process application command (AppCommand) if len(args) == 0: raise Exception(_("Expected command")) @@ -318,52 +272,40 @@ def execute_command(app, argv): command.func(app, args) else: raise Exception(_("Unknown command '%s'") % args[0]) - - # start first window + + # Start first window if not options.no_gui: if len(app.get_windows()) == 0: app.new_window() return True - return False - #------------------------------------------ - # process a non-command - + # Process a non-command if options.no_gui: return False if len(args) > 0: - for arg in args: - if keepnote.notebook.is_node_url(arg): - # goto a node + # Goto a node host, nodeid = keepnote.notebook.parse_node_url(arg) app.goto_nodeid(nodeid) - elif keepnote.extension.is_extension_install_file(arg): - # install extension + # Install extension if len(app.get_windows()) == 0: app.new_window() - app.install_extension(arg) - else: - # open specified notebook + # Open specified notebook if len(app.get_windows()) == 0: app.new_window() app.get_current_window().open_notebook(arg) - else: - # no arguments + # No arguments win = app.new_window() - # open default notebook + # Open default notebook if len(app.get_windows()) == 1 and options.default_notebook: - # TODO: finish - # reopen all windows referenced by notebooks - for path in app.pref.get("default_notebooks", default=[]): win.open_notebook(path, open_here=False) @@ -372,36 +314,33 @@ def execute_command(app, argv): def list_commands(app): """List available commands""" - commands = app.get_commands() commands.sort(key=lambda x: x.name) - print - print "available commands:" + print() + print("available commands:") for command in commands: - print " " + command.name, + print(" " + command.name, end="") if command.metavar: - print " " + command.metavar, + print(" " + command.metavar, end="") if command.help: - print " -- " + command.help, - print - + print(" -- " + command.help, end="") + print() def main(argv): - """Main execution""" - + """Main execution""" options, args = parse_argv(argv) - - # init preference dir + + # Init preference dir keepnote.compat.pref.check_old_user_pref_dir() if not os.path.exists(keepnote.get_user_pref_dir()): keepnote.init_user_pref_dir() - # start error log + # Start error log start_error_log(options.show_errors) - # get command executor + # Get command executor if options.newproc: main_proc = True cmd_exec = CommandExecutor() @@ -413,33 +352,32 @@ def main(argv): main_proc, cmd_exec = get_command_executor( lambda app, argv: gui_exec( lambda: execute_command(app, argv)), - port=options.port) + port=options.port) if main_proc: - # initiate main process + # Initiate main process if options.no_gui: start_non_gui(argv, options, args, cmd_exec) else: start_gui(argv, options, args, cmd_exec) else: - # this is a command process, send command to main process + # This is a command process, send command to main process cmd_exec.execute(argv) - # wait for other threads to close application + # Wait for other threads to close application if options.cont: while True: time.sleep(1000) -#============================================================================= -# start main function -# catch any exceptions that occur + +# ============================================================================= +# Start main function +# Catch any exceptions that occur try: main(sys.argv) -except exceptions.SystemExit, e: +except SystemExit as e: # sys.exit() was called pass -except Exception, e: +except Exception as e: traceback.print_exc() - sys.stderr.flush() - - + sys.stderr.flush() \ No newline at end of file diff --git a/keepnote/maskdict.py b/keepnote/maskdict.py index 61e53d5bd..dde42f822 100644 --- a/keepnote/maskdict.py +++ b/keepnote/maskdict.py @@ -5,24 +5,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# class MaskDict (dict): @@ -97,7 +79,7 @@ def __iter__(self): return (key for key in self._dict if key not in self._mask) def __repr__(self): - return repr(dict(self.iteritems())) + return repr(dict(iter(self.items()))) def __str__(self): - return str(dict(self.iteritems())) + return str(dict(iter(self.items()))) diff --git a/keepnote/mswin/__init__.py b/keepnote/mswin/__init__.py index 2f8ff61f1..7d8833dd0 100644 --- a/keepnote/mswin/__init__.py +++ b/keepnote/mswin/__init__.py @@ -1,75 +1,39 @@ +import os -# make sure py2exe finds win32com -try: - import sys - import modulefinder - import win32com - for p in win32com.__path__[1:]: - modulefinder.AddPackagePath("win32com", p) - for extra in ["win32com.shell"]: - __import__(extra) - m = sys.modules[extra] - for p in m.__path__[1:]: - modulefinder.AddPackagePath(extra, p) -except ImportError: - # no build path setup, no worries. - pass +import platform -try: - import pywintypes - import winerror - from win32com.shell import shell, shellcon - import win32api - import win32gui - import win32con - import win32ui - - import ctypes.windll.kernel32 - - # pyflakes ignore - pywintypes - winerror - shell - shellcon - win32api - win32gui - win32con - win32ui - ctypes - -except: - pass +if platform.system() == "Windows": + import winreg def get_my_documents(): - """Return the My Documents folder""" - # See: - # http://msdn.microsoft.com/en-us/library/windows/desktop/bb776887%28v=vs.85%29.aspx#mydocs # nopep8 - # http://msdn.microsoft.com/en-us/library/bb762494%28v=vs.85%29.aspx#csidl_personal # nopep8 - + """Returns path to My Documents folder on Windows""" try: - df = shell.SHGetDesktopFolder() - pidl = df.ParseDisplayName( - 0, None, "::{450d8fba-ad25-11d0-98a8-0800361b1103}")[1] - except pywintypes.com_error, e: - if e.hresult == winerror.E_INVALIDARG: - # This error occurs when the My Documents virtual folder - # is not available below the Desktop virtual folder in the - # file system. This may be the case if it has been made - # unavailable using a Group Policy setting. See - # http://technet.microsoft.com/en-us/library/cc978354.aspx. - pidl = shell.SHGetSpecialFolderLocation(0, shellcon.CSIDL_PERSONAL) - else: - raise - mydocs = shell.SHGetPathFromIDList(pidl) - - # TODO: may need to handle window-specific encoding here. - #encoding = locale.getdefaultlocale()[1] - #if encoding is None: - # encoding = "utf-8" - - return mydocs - - -#def set_env(key, val): -# ctypes.windll.kernel32.SetEnvironmentVariableW(key, val) + # 打开注册表键 + key = winreg.OpenKey( + winreg.HKEY_CURRENT_USER, + r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" + ) + # 读取 "Personal" 值（对应 "My Documents" 或 "Documents" 路径） + path, _ = winreg.QueryValueEx(key, "Personal") + winreg.CloseKey(key) + if path and os.path.exists(path): + return path + except (OSError, FileNotFoundError, WindowsError): + # 如果注册表读取失败，回退到其他方法 + pass + + # 回退到使用环境变量 USERPROFILE + user_profile = os.getenv("USERPROFILE") + if user_profile: + default_path = os.path.join(user_profile, "Documents") + if os.path.exists(default_path): + return default_path + + # 最后回退到默认路径 + default_path = os.path.join(os.path.expanduser("~"), "Documents") + if os.path.exists(default_path): + return default_path + + # 如果所有方法都失败，返回用户主目录 + return os.path.expanduser("~") \ No newline at end of file diff --git a/keepnote/mswin/screenshot.bmp b/keepnote/mswin/screenshot.bmp new file mode 100644 index 000000000..7b3417c9a Binary files /dev/null and b/keepnote/mswin/screenshot.bmp differ diff --git a/keepnote/mswin/screenshot.py b/keepnote/mswin/screenshot.py index 060dbcf60..336c9acfd 100644 --- a/keepnote/mswin/screenshot.py +++ b/keepnote/mswin/screenshot.py @@ -1,29 +1,3 @@ -""" - - KeepNote - Screenshot utility for MS Windows - -""" - - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# import sys @@ -33,15 +7,13 @@ import win32gui import win32con import win32ui -except ImportError, e: - pass +except ImportError as e: + raise ImportError("pywin32 is required for screenshot functionality on Windows") from e _g_class_num = 0 - -def capture_screen(filename, x, y, x2, y2): - """Captures a screenshot from a region of the screen""" - +def capture_screen(filename: str, x: int, y: int, x2: int, y2: int) -> None: + """Captures a screenshot from a region of the screen.""" if x > x2: x, x2 = x2, x if y > y2: @@ -49,7 +21,6 @@ def capture_screen(filename, x, y, x2, y2): w, h = x2 - x, y2 - y screen_handle = win32gui.GetDC(0) - screen_dc = win32ui.CreateDCFromHandle(screen_handle) shot_dc = screen_dc.CreateCompatibleDC() @@ -61,28 +32,33 @@ def capture_screen(filename, x, y, x2, y2): shot_bitmap.SaveBitmapFile(shot_dc, filename) - -class Window (object): - """Class for basic MS Windows window""" - - def __init__(self, title="Untitled", - style=None, - exstyle=None, - pos=(0, 0), - size=(400, 400), - background=None, - message_map = {}, - cursor=None): + # Clean up resources + shot_dc.DeleteDC() + screen_dc.DeleteDC() + win32gui.ReleaseDC(0, screen_handle) + +class Window: + """Class for basic MS Windows window.""" + def __init__(self, title: str = "Untitled", + style: int | None = None, + exstyle: int | None = None, + pos: tuple[int, int] = (0, 0), + size: tuple[int, int] = (400, 400), + background: int | None = None, + message_map: dict = None, + cursor: int | None = None): global _g_class_num if style is None: style = win32con.WS_OVERLAPPEDWINDOW if exstyle is None: - style = win32con.WS_EX_LEFT + exstyle = win32con.WS_EX_LEFT if background is None: background = win32con.COLOR_WINDOW if cursor is None: cursor = win32con.IDC_ARROW + if message_map is None: + message_map = {} self._instance = win32api.GetModuleHandle(None) @@ -90,10 +66,10 @@ def __init__(self, title="Untitled", self.message_map.update(message_map) _g_class_num += 1 - class_name = "class_name%d" % _g_class_num + class_name = f"class_name{_g_class_num}" wc = win32gui.WNDCLASS() wc.hInstance = self._instance - wc.lpfnWndProc = self.message_map # could also specify a wndproc + wc.lpfnWndProc = self.message_map wc.lpszClassName = class_name wc.style = win32con.CS_HREDRAW | win32con.CS_VREDRAW wc.hbrBackground = background @@ -103,48 +79,41 @@ def __init__(self, title="Untitled", class_atom = win32gui.RegisterClass(wc) - # C code: - # wc.cbWndExtra = DLGWINDOWEXTRA + sizeof(HBRUSH) + (sizeof(COLORREF)); - #wc.cbWndExtra = win32con.DLGWINDOWEXTRA + struct.calcsize("Pi") - #wc.hIconSm = 0 - self._handle = win32gui.CreateWindowEx( exstyle, - class_atom, title, - style, # win32con.WS_POPUP, # | win32con.WS_EX_TRANSPARENT, + class_name, title, + style, pos[0], pos[1], size[0], size[1], 0, # no parent 0, # no menu self._instance, - None) + None + ) - def show(self, enabled=True): + def show(self, enabled: bool = True) -> None: if enabled: win32gui.ShowWindow(self._handle, win32con.SW_SHOW) else: win32gui.ShowWindow(self._handle, win32con.SW_HIDE) - def maximize(self): + def maximize(self) -> None: win32gui.ShowWindow(self._handle, win32con.SW_SHOWMAXIMIZED) - def activate(self): + def activate(self) -> None: win32gui.SetForegroundWindow(self._handle) - # SwitchToThisWindow(self._handle, False) - def _on_destroy(self, hwnd, message, wparam, lparam): + def _on_destroy(self, hwnd: int, message: int, wparam: int, lparam: int) -> bool: self.close() return True - def close(self): - #win32gui.PostQuitMessage(0) + def close(self) -> None: win32gui.DestroyWindow(self._handle) - -class WinLoop (object): +class WinLoop: def __init__(self): self._running = True - def start(self): + def start(self) -> None: while self._running: b, msg = win32gui.GetMessage(0, 0, 0) if not msg: @@ -152,44 +121,40 @@ def start(self): win32gui.TranslateMessage(msg) win32gui.DispatchMessage(msg) - def stop(self): + def stop(self) -> None: self._running = False - -class ScreenShotWindow (Window): - """ScreenShot Window""" - - def __init__(self, filename, shot_callback=None): +class ScreenShotWindow(Window): + """ScreenShot Window.""" + def __init__(self, filename: str, shot_callback=None): x, y, w, h = win32gui.GetWindowRect(win32gui.GetDesktopWindow()) - Window.__init__( - self, + super().__init__( "Screenshot", pos=(x, y), size=(w, h), - style = win32con.WS_POPUP, - exstyle = win32con.WS_EX_TRANSPARENT, - background = 0, - message_map = { + style=win32con.WS_POPUP, + exstyle=win32con.WS_EX_TRANSPARENT, + background=0, + message_map={ win32con.WM_MOUSEMOVE: self._on_mouse_move, win32con.WM_LBUTTONDOWN: self._on_mouse_down, win32con.WM_LBUTTONUP: self._on_mouse_up }, - cursor=win32con.IDC_CROSS) + cursor=win32con.IDC_CROSS + ) self._filename = filename self._shot_callback = shot_callback self._drag = False self._draw = False - def _on_mouse_down(self, hwnd, message, wparam, lparam): - """Mouse down event""" + def _on_mouse_down(self, hwnd: int, message: int, wparam: int, lparam: int) -> None: + """Mouse down event.""" self._drag = True self._start = win32api.GetCursorPos() - def _on_mouse_up(self, hwnd, message, wparam, lparam): - """Mouse up event""" - + def _on_mouse_up(self, hwnd: int, message: int, wparam: int, lparam: int) -> None: + """Mouse up event.""" if self._draw: - # cleanup rectangle on desktop self._drag = False self._draw = False @@ -198,43 +163,40 @@ def _on_mouse_up(self, hwnd, message, wparam, lparam): pycdc.SetROP2(win32con.R2_NOTXORPEN) win32gui.Rectangle(hdc, self._start[0], self._start[1], - self._end[0], self._end[1]) + self._end[0], self._end[1]) - # save bitmap capture_screen(self._filename, self._start[0], self._start[1], - self._end[0], self._end[1]) + self._end[0], self._end[1]) + + pycdc.DeleteDC() + win32gui.ReleaseDC(0, hdc) self.close() if self._shot_callback: self._shot_callback() - def _on_mouse_move(self, hwnd, message, wparam, lparam): - """Mouse moving event""" - - # get current mouse coordinates + def _on_mouse_move(self, hwnd: int, message: int, wparam: int, lparam: int) -> None: + """Mouse moving event.""" x, y = win32api.GetCursorPos() if self._drag: - hdc = win32gui.CreateDC("DISPLAY", None, None) pycdc = win32ui.CreateDCFromHandle(hdc) pycdc.SetROP2(win32con.R2_NOTXORPEN) - # erase old rectangle if self._draw: win32gui.Rectangle(hdc, self._start[0], self._start[1], - self._end[0], self._end[1]) + self._end[0], self._end[1]) - # draw new rectangle self._draw = True win32gui.Rectangle(hdc, self._start[0], self._start[1], x, y) self._end = (x, y) - #DeleteDC ( hdc); + pycdc.DeleteDC() + win32gui.ReleaseDC(0, hdc) - -def take_screenshot(filename): +def take_screenshot(filename: str) -> None: win32gui.InitCommonControls() def click(): @@ -246,18 +208,9 @@ def click(): win.activate() loop.start() - #win32gui.PumpMessages() - - -def main(argv): - - if len(argv) > 1: - filename = sys.argv[1] - else: - filename = "screenshot.bmp" - +def main(argv: list[str]) -> None: + filename = argv[1] if len(argv) > 1 else "screenshot.bmp" take_screenshot(filename) - if __name__ == "__main__": - main(sys.argv) + main(sys.argv) \ No newline at end of file diff --git a/keepnote/notebook/__init__.py b/keepnote/notebook/__init__.py index 3ac643ed6..7526af58c 100644 --- a/keepnote/notebook/__init__.py +++ b/keepnote/notebook/__init__.py @@ -5,36 +5,17 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports import mimetypes import os import sys import re -import urlparse -import urllib2 +import urllib.parse +import urllib.request, urllib.error, urllib.parse import uuid import xml.etree.cElementTree as ET -# keepnote imports +# keepnote.py imports from keepnote.listening import Listeners from keepnote.timestamp import get_timestamp from keepnote import trans @@ -50,7 +31,8 @@ from keepnote.notebook.connection.fs import get_valid_unique_filename from keepnote.notebook.connection.fs import index as notebook_index from keepnote.notebook import sync - +import logging +logging.basicConfig(filename="keepnote_debug.log", level=logging.DEBUG) # pyflakes import get_valid_unique_filename @@ -62,46 +44,46 @@ # NOTE: the header is left off to keep it compatiable with IE, # for the time being. # constants -NOTE_HEADER = u"""\ +NOTE_HEADER = """\ """ -NOTE_FOOTER = u"" +NOTE_FOOTER = "" BLANK_NOTE = NOTE_HEADER + NOTE_FOOTER NOTEBOOK_FORMAT_VERSION = 6 ELEMENT_NODE = 1 -PAGE_DATA_FILE = u"page.html" -PREF_FILE = u"notebook.nbk" -NOTEBOOK_META_DIR = u"__NOTEBOOK__" -NOTEBOOK_ICON_DIR = u"icons" -TRASH_DIR = u"__TRASH__" -TRASH_NAME = u"Trash" -DEFAULT_PAGE_NAME = u"New Page" -DEFAULT_DIR_NAME = u"New Folder" +PAGE_DATA_FILE = "page.html" +PREF_FILE = "notebook.nbk" +NOTEBOOK_META_DIR = "__NOTEBOOK__" +NOTEBOOK_ICON_DIR = "icons" +TRASH_DIR = "__TRASH__" +TRASH_NAME = "Trash" +DEFAULT_PAGE_NAME = "New Page" +DEFAULT_DIR_NAME = "New Folder" # content types -CONTENT_TYPE_PAGE = u"text/xhtml+xml" +CONTENT_TYPE_PAGE = "text/xhtml+xml" #CONTENT_TYPE_PLAIN_TEXT = "text/plain" -CONTENT_TYPE_TRASH = u"application/x-notebook-trash" -CONTENT_TYPE_DIR = u"application/x-notebook-dir" -CONTENT_TYPE_UNKNOWN = u"application/x-notebook-unknown" +CONTENT_TYPE_TRASH = "application/x-notebook-trash" +CONTENT_TYPE_DIR = "application/x-notebook-dir" +CONTENT_TYPE_UNKNOWN = "application/x-notebook-unknown" NULL = object() # the node id of the implied root of all nodes everywhere -UNIVERSAL_ROOT = u"b810760f-f246-4e42-aebb-50ce51c3d1ed" +UNIVERSAL_ROOT = "b810760f-f246-4e42-aebb-50ce51c3d1ed" #============================================================================= # common filesystem functions -def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, +def get_unique_filename(path, filename, ext="", sep=" ", number=2, return_number=False, use_number=False): """Returns a unique version of a filename for a given directory""" - if path != u"": + if path != "": assert os.path.exists(path), path # try the given filename @@ -113,13 +95,13 @@ def get_unique_filename(path, filename, ext=u"", sep=u" ", number=2, # try numbered suffixes i = number while True: - newname = os.path.join(path, filename + sep + unicode(i) + ext) + newname = os.path.join(path, filename + sep + str(i) + ext) if not os.path.exists(newname): return (newname, i) if return_number else newname i += 1 -def get_unique_filename_list(filenames, filename, ext=u"", sep=u" ", number=2, +def get_unique_filename_list(filenames, filename, ext="", sep=" ", number=2, return_number=False, use_number=False): """Returns a unique filename for a given list of existing files""" filenames = set(filenames) @@ -133,7 +115,7 @@ def get_unique_filename_list(filenames, filename, ext=u"", sep=u" ", number=2, # try numbered suffixes i = number while True: - newname = filename + sep + unicode(i) + ext + newname = filename + sep + str(i) + ext if newname not in filenames: return (newname, i) if return_number else newname i += 1 @@ -196,11 +178,11 @@ def normalize_notebook_dirname(filename, longpath=None): #============================================================================= # HTML functions -TAG_PATTERN = re.compile(u"<[^>]*>") +TAG_PATTERN = re.compile("<[^>]*>") def strip_tags(line): - return re.sub(TAG_PATTERN, u"", line) + return re.sub(TAG_PATTERN, "", line) def read_data_as_plain_text(infile): @@ -234,15 +216,19 @@ def read_data_as_plain_text(infile): def get_notebook_version(filename): """Read the version of a notebook from its preference file""" - if os.path.isdir(filename): filename = get_pref_file(filename) + # Check if the file exists before attempting to read it + if not os.path.exists(filename): + keepnote.log_message(f"Notebook preference file '{filename}' not found. Assuming default version {NOTEBOOK_FORMAT_VERSION}.\n") + return NOTEBOOK_FORMAT_VERSION + try: tree = ET.ElementTree(file=filename) - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot read notebook preferences"), e) - except Exception, e: + except Exception as e: raise NoteBookError(_("Notebook preference data is corrupt"), e) return get_notebook_version_etree(tree) @@ -268,17 +254,17 @@ def get_notebook_version_etree(tree): def new_nodeid(): """Generate a new node id""" - return unicode(uuid.uuid4()) + return str(uuid.uuid4()) -def get_node_url(nodeid, host=u""): +def get_node_url(nodeid, host=""): """Get URL for a nodeid""" - return u"nbk://%s/%s" % (host, nodeid) + return "nbk://%s/%s" % (host, nodeid) def is_node_url(url): """Returns True if URL is a node""" - return re.match(u"nbk://[^/]*/.*", url) is not None + return re.match("nbk://[^/]*/.*", url) is not None def parse_node_url(url): @@ -288,7 +274,7 @@ def parse_node_url(url): nbk:///abcd => ("", "abcd") nbk://example.com/abcd => ("example.com", "abcd") """ - match = re.match(u"nbk://([^/]*)/(.*)", url) + match = re.match("nbk://([^/]*)/(.*)", url) if match: return match.groups() else: @@ -343,7 +329,7 @@ def attach_file(filename, node, index=None): child.save(True) return child - except Exception, e: + except Exception as e: # remove child keepnote.log_error(e) if child: @@ -354,11 +340,11 @@ def attach_file(filename, node, index=None): #============================================================================= # errors -class NoteBookError (StandardError): +class NoteBookError (Exception): """Exception that occurs when manipulating NoteBook's""" def __init__(self, msg, error=None): - StandardError.__init__(self) + Exception.__init__(self) self.msg = msg self.error = error @@ -446,7 +432,7 @@ def parse(self, lst): def format(self): return [attr_def.format() - for attr_def in self._attr_defs.itervalues()] + for attr_def in self._attr_defs.values()] def format_attr_def(attr_def): @@ -472,7 +458,7 @@ def iter_attr_defs(lst): AttrDef( "content_type", "string", "Content type", default=CONTENT_TYPE_DIR), AttrDef("title", "string", "Title"), - AttrDef("order", "integer", "Order", default=sys.maxint), + AttrDef("order", "integer", "Order", default=sys.maxsize), AttrDef("created_time", "timestamp", "Created time"), AttrDef("modified_time", "timestamp", "Modified time"), AttrDef("expanded", "bool", "Expaned", default=True), @@ -526,7 +512,7 @@ def parse(self, lst): def format(self): return [attr_table.format() - for attr_table in self._attr_tables.itervalues()] + for attr_table in self._attr_tables.values()] g_default_attr_tables = [ @@ -557,7 +543,7 @@ def iter_attr_tables(lst): class NoteBookNode (object): """A general base class for all nodes in a NoteBook""" - def __init__(self, title=u"", parent=None, notebook=None, + def __init__(self, title="", parent=None, notebook=None, content_type=CONTENT_TYPE_DIR, conn=None, attr=None): self._notebook = notebook @@ -604,7 +590,7 @@ def get_url(self, host=""): def clear_attr(self, title="", content_type=CONTENT_TYPE_DIR): """Clear attributes (set them to defaults)""" - for key in self._attr.keys(): + for key in list(self._attr.keys()): if key not in BUILTIN_ATTR: del self._attr[key] @@ -637,7 +623,7 @@ def del_attr(self, name): def iter_attr(self): """Iterate through attributes of the node""" - return self._attr.iteritems() + return iter(self._attr.items()) def _init_attr(self): """Initialize attributes from a dict""" @@ -667,16 +653,16 @@ def set_attr_timestamp(self, name, timestamp=None): def set_payload(self, filename, new_filename=None): """Copy file into NoteBook directory""" - + logging.debug(f"Loading notebook at: {path}") # determine new file name if new_filename is None: new_filename = os.path.basename(filename) new_filename = connection_fs.new_filename( self._conn, self._attr["nodeid"], new_filename, None) - + logging.debug("Finished loading notebook") try: # attempt url parse - parts = urlparse.urlparse(filename) + parts = urllib.parse.urlparse(filename) if os.path.exists(filename) or parts[0] == "": # perform local copy @@ -685,7 +671,7 @@ def set_payload(self, filename, new_filename=None): else: # perform download out = self.open_file(new_filename, "w") - infile = urllib2.urlopen(filename) + infile = urllib.request.urlopen(filename) while True: data = infile.read(1024*4) if data == "": @@ -693,7 +679,7 @@ def set_payload(self, filename, new_filename=None): out.write(data) infile.close() out.close() - except Exception, e: + except Exception as e: raise NoteBookError(_("Cannot copy file '%s'" % filename), e) # set attr @@ -709,7 +695,7 @@ def create(self): self._attr["nodeid"] = new_nodeid() self._attr["parentids"] = [self._parent._attr["nodeid"]] self._attr["childrenids"] = [] - self._attr.setdefault("order", sys.maxint) + self._attr.setdefault("order", sys.maxsize) self._init_attr() @@ -995,7 +981,7 @@ def _get_children(self): self._children = list(self._iter_children()) # assign orders - self._children.sort(key=lambda x: x._attr.get("order", sys.maxint)) + self._children.sort(key=lambda x: x._attr.get("order", sys.maxsize)) self._set_child_order() def _iter_children(self): @@ -1069,7 +1055,7 @@ def open_file(self, filename, mode="r", codec=None): def delete_file(self, filename): return self._conn.delete_file(self._attr["nodeid"], filename) - def new_filename(self, new_filename, ext=u"", sep=u" ", number=2, + def new_filename(self, new_filename, ext="", sep=" ", number=2, return_number=False, use_number=False, ensure_valid=True): return connection_fs.new_filename( self._conn, @@ -1308,7 +1294,7 @@ def load(self, filename, conn=None): safefile.open(pref_file, codec="utf-8")) # TODO: temp solution. remove soon. - index_dir = self.pref.get("index_dir", default=u"") + index_dir = self.pref.get("index_dir", default="") if index_dir and os.path.exists(index_dir): self._conn._set_index_file( os.path.join(index_dir, notebook_index.INDEX_FILE)) @@ -1340,7 +1326,7 @@ def load(self, filename, conn=None): def save(self, force=False): """Recursively save any loaded nodes""" - # TODO: keepnote copy of old pref. only save pref if its changed. + # TODO: keepnote.py copy of old pref. only save pref if its changed. if force or self in self._dirty: self._write_attr_defs() @@ -1471,7 +1457,7 @@ def _init_trash(self): {"title": TRASH_NAME}) self._add_child(self._trash) - except NoteBookError, e: + except NoteBookError as e: raise NoteBookError(_("Cannot create Trash folder"), e) def is_trash_dir(self, node): @@ -1523,7 +1509,7 @@ def install_icon(self, filename): NOTEBOOK_META_DIR, NOTEBOOK_ICON_DIR, basename) newfilename = connection_fs.new_filename( - self._conn, self._attr["nodeid"], newfilename, ext, u"-", + self._conn, self._attr["nodeid"], newfilename, ext, "-", ensure_valid=False) self._conn.copy_file(None, filename, @@ -1544,17 +1530,17 @@ def install_icons(self, filename, filename_open): use_number = False while True: newfilename, number = connection_fs.new_filename( - self._conn, self._attr["nodeid"], startname, ext, u"-", + self._conn, self._attr["nodeid"], startname, ext, "-", number=number, return_number=True, use_number=use_number, ensure_valid=False) # determine open icon filename newfilename_open = startname if number: - newfilename_open += u"-" + unicode(number) + newfilename_open += "-" + str(number) else: number = 2 - newfilename_open += u"-open" + ext + newfilename_open += "-open" + ext # see if it already exists if self._conn.has_file(self._attr["nodeid"], newfilename_open): @@ -1686,18 +1672,18 @@ def write_preferences(self): data = self.pref.get_data() out = self.open_file(PREF_FILE, "w", codec="utf-8") - out.write(u'\n' - u'\n' - u'%d\n' - u'\n' % data["version"]) + out.write('\n' + '\n' + '%d\n' + '\n' % data["version"]) plist.dump(data, out, indent=4, depth=4) - out.write(u'\n' - u'\n') + out.write('\n' + '\n') out.close() - except (IOError, OSError), e: + except (IOError, OSError) as e: raise NoteBookError(_("Cannot save notebook preferences"), e) - except Exception, e: + except Exception as e: raise NoteBookError(_("File format error"), e) def read_preferences(self, infile=None): @@ -1707,10 +1693,10 @@ def read_preferences(self, infile=None): infile = self.open_file(PREF_FILE, "r", codec="utf-8") root = ET.fromstring(infile.read()) tree = ET.ElementTree(root) - except IOError, e: + except IOError as e: raise NoteBookError(_("Cannot read notebook preferences %s") % self.get_file(PREF_FILE), e) - except Exception, e: + except Exception as e: keepnote.log_error(e) #if recover: # if infile: @@ -1747,5 +1733,5 @@ def read_preferences(self, infile=None): def _recover_preferences(self): out = self.open_file(PREF_FILE, "w", "utf-8") - out.write(u"") + out.write("") out.close() diff --git a/keepnote/notebook/connection/__init__.py b/keepnote/notebook/connection/__init__.py index a104c573e..fe0ee204d 100644 --- a/keepnote/notebook/connection/__init__.py +++ b/keepnote/notebook/connection/__init__.py @@ -6,42 +6,23 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -import urlparse +import urllib.parse #============================================================================= # errors -class ConnectionError (StandardError): +class ConnectionError (Exception): def __init__(self, msg="", error=None): - StandardError.__init__(self, msg) + Exception.__init__(self, msg) self.error = error def repr(self): if self.error is not None: - return StandardError.repr(self) + ": " + repr(self.error) + return Exception.repr(self) + ": " + repr(self.error) else: - return StandardError.repr(self) + return Exception.repr(self) class UnknownNode (ConnectionError): @@ -381,7 +362,7 @@ def get_proto(self, url): if "://" not in url: proto = "file" else: - parts = urlparse.urlsplit(url) + parts = urllib.parse.urlsplit(url) proto = parts.scheme if parts.scheme else "file" return proto diff --git a/keepnote/notebook/connection/fs/__init__.py b/keepnote/notebook/connection/fs/__init__.py index 9ca6386e6..09d9d5a70 100644 --- a/keepnote/notebook/connection/fs/__init__.py +++ b/keepnote/notebook/connection/fs/__init__.py @@ -6,25 +6,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - """ Strategy for detecting unmanaged notebook modifications, which I also call tampering. @@ -90,7 +71,7 @@ import xml.etree.cElementTree as ET -# keepnote imports +# keepnote.py imports import keepnote from keepnote import safefile, plist, maskdict from keepnote import trans @@ -110,13 +91,13 @@ _ = trans.translate # constants -XML_HEADER = u"""\ +XML_HEADER = """\ """ -NOTEBOOK_META_DIR = u"__NOTEBOOK__" -LOSTDIR = u"lost_found" -ORPHANDIR = u"orphans" +NOTEBOOK_META_DIR = "__NOTEBOOK__" +LOSTDIR = "lost_found" +ORPHANDIR = "orphans" MAX_LEN_NODE_FILENAME = 40 @@ -150,12 +131,12 @@ def get_orphandir(nodepath, nodeid=None): #============================================================================= # functions for ensuring valid filenames in notebooks -REGEX_SLASHES = re.compile(ur"[/\\]") -REGEX_BAD_CHARS = re.compile(ur"[\*\?'&<>|`:;]") -REGEX_LEADING_UNDERSCORE = re.compile(ur"^__+") +REGEX_SLASHES = re.compile(r"[/\\]") +REGEX_BAD_CHARS = re.compile(r"[\*\?'&<>|`:;]") +REGEX_LEADING_UNDERSCORE = re.compile(r"^__+") -def get_valid_filename(filename, default=u"folder", +def get_valid_filename(filename, default="folder", maxlen=MAX_LEN_NODE_FILENAME): """ Converts a filename into a valid one @@ -163,16 +144,16 @@ def get_valid_filename(filename, default=u"folder", Strips bad characters from filename """ filename = filename[:maxlen] - filename = re.sub(REGEX_SLASHES, u"-", filename) - filename = re.sub(REGEX_BAD_CHARS, u"", filename) - filename = filename.replace(u"\t", " ") - filename = filename.strip(u" \t.") + filename = re.sub(REGEX_SLASHES, "-", filename) + filename = re.sub(REGEX_BAD_CHARS, "", filename) + filename = filename.replace("\t", " ") + filename = filename.strip(" \t.") # don't allow files to start with two underscores - filename = re.sub(REGEX_LEADING_UNDERSCORE, u"", filename) + filename = re.sub(REGEX_LEADING_UNDERSCORE, "", filename) # don't allow pure whitespace filenames - if filename == u"": + if filename == "": filename = default # use only lower case, some filesystems have trouble with mixed case @@ -181,7 +162,7 @@ def get_valid_filename(filename, default=u"folder", return filename -def get_valid_unique_filename(path, filename, ext=u"", sep=u" ", number=2, +def get_valid_unique_filename(path, filename, ext="", sep=" ", number=2, return_number=False, use_number=False): """Returns a valid and unique version of a filename for a given path""" return keepnote.notebook.get_unique_filename( @@ -190,7 +171,7 @@ def get_valid_unique_filename(path, filename, ext=u"", sep=u" ", number=2, def get_valid_unique_filename_list(filenames, filename, - ext=u"", sep=u" ", number=2, + ext="", sep=" ", number=2, return_number=False, use_number=False): """Returns a valid and unique version of a filename for a given path""" return keepnote.notebook.get_unique_filename_list( @@ -198,7 +179,7 @@ def get_valid_unique_filename_list(filenames, filename, return_number=return_number, use_number=use_number) -def new_filename(conn, nodeid, new_filename, ext=u"", sep=u" ", number=2, +def new_filename(conn, nodeid, new_filename, ext="", sep=" ", number=2, return_number=False, use_number=False, ensure_valid=True, _path=None): @@ -210,7 +191,7 @@ def new_filename(conn, nodeid, new_filename, ext=u"", sep=u" ", number=2, _path=_path) -def new_filename_list(filenames, new_filename, ext=u"", sep=u" ", number=2, +def new_filename_list(filenames, new_filename, ext="", sep=" ", number=2, return_number=False, use_number=False, ensure_valid=True, _path=None): @@ -247,7 +228,7 @@ def iter_child_node_paths(path): for child in children: child_path = os.path.join(path, child) - if os.path.isfile(os.path.join(child_path, u"node.xml")): + if os.path.isfile(os.path.join(child_path, "node.xml")): yield child_path @@ -275,8 +256,8 @@ def last_node_change(path): for dirpath, dirnames, filenames in os.walk(path): mtime = max(mtime, stat(dirpath).st_mtime) - if u"node.xml" in filenames: - mtime = max(mtime, stat(join(dirpath, u"node.xml")).st_mtime) + if "node.xml" in filenames: + mtime = max(mtime, stat(join(dirpath, "node.xml")).st_mtime) return mtime @@ -328,9 +309,9 @@ def read_attr(filename, set_extra=True): """ try: tree = ET.ElementTree(file=filename) - except Exception, e: + except Exception as e: raise ConnectionError( - _(u"Error reading meta data file '%s'" % filename), e) + _("Error reading meta data file '%s'" % filename), e) # check root root = tree.getroot() @@ -353,7 +334,7 @@ def read_attr(filename, set_extra=True): extra['nodeid'] = attr['nodeid'] if set_extra: - for key, value in extra.items(): + for key, value in list(extra.items()): attr[key] = value return attr, extra @@ -366,24 +347,27 @@ def write_attr(filename, nodeid, attr): filename -- a filename or stream attr -- attribute dict """ - if isinstance(filename, basestring): + if isinstance(filename, str): out = safefile.open(filename, "w", codec="utf-8") + else: + out = filename # 如果传入的是流，则直接使用 - # Ensure nodeid is consistent if given. + # Ensure nodeid is consistent if given nodeid2 = attr.get('nodeid') if nodeid2: assert nodeid == nodeid2, (nodeid, nodeid2) - version = attr.get('version', - keepnote.notebook.NOTEBOOK_FORMAT_VERSION) - out.write(u'\n' - u'\n' - u'%d\n' - u'%s\n' % (version, nodeid)) - plist.dump(attr, out, indent=2, depth=0) - out.write(u'\n') + version = attr.get('version', keepnote.notebook.NOTEBOOK_FORMAT_VERSION) + + # Write XML as strings + out.write('\n') + out.write('\n') + out.write(f'{str(version)}\n') # Ensure version is a string + out.write(f'{str(nodeid)}\n') # Ensure nodeid is a string + plist.dump(attr, out, indent=2, depth=0) # plist.dump should handle strings + out.write('\n') - if isinstance(filename, basestring): + if isinstance(filename, str): out.close() @@ -405,7 +389,7 @@ class PathCache (object): """ An in-memory cache of filesystem paths for nodeids """ - def __init__(self, rootid=None, rootpath=u""): + def __init__(self, rootid=None, rootpath=""): self._root_parent = object() self._nodes = {None: self._root_parent} @@ -637,14 +621,14 @@ def _move_to_lostdir(self, filename): os.makedirs(lostdir) new_filename = keepnote.notebook.get_unique_filename( - lostdir, os.path.basename(filename), sep=u"-") + lostdir, os.path.basename(filename), sep="-") - keepnote.log_message(u"moving data to lostdir '%s' => '%s'\n" % + keepnote.log_message("moving data to lostdir '%s' => '%s'\n" % (filename, new_filename)) try: os.rename(filename, new_filename) - except OSError, e: - raise ConnectionError(u"unable to store lost file '%s'" + except OSError as e: + raise ConnectionError("unable to store lost file '%s'" % filename, e) #====================== @@ -720,7 +704,7 @@ def create_node(self, nodeid, attr, _path=None): os.makedirs(path) self._write_attr(attr_file, nodeid, attr) - except OSError, e: + except OSError as e: raise ConnectionError(_("Cannot create node"), e) # Finish initializing root. @@ -814,7 +798,7 @@ def update_node(self, nodeid, attr): # Move to a new parent. self._rename_node_dir(nodeid, attr, parentid, parentid2, path) elif (parentid and title_index and - title_index != attr.get("title", u"")): + title_index != attr.get("title", "")): # Rename node directory, but # do not rename root node dir (parentid is None). self._rename_node_dir(nodeid, attr, parentid, parentid2, path) @@ -840,9 +824,9 @@ def _rename_node_dir(self, nodeid, attr, parentid, new_parentid, path): try: os.rename(path, new_path) - except Exception, e: + except Exception as e: raise ConnectionError( - _(u"Cannot rename '%s' to '%s'" % (path, new_path)), e) + _("Cannot rename '%s' to '%s'" % (path, new_path)), e) # update index self._path_cache.move(nodeid, basename, new_parentid) @@ -867,9 +851,9 @@ def delete_node(self, nodeid): try: shutil.rmtree(path) - except Exception, e: + except Exception as e: raise ConnectionError( - _(u"Do not have permission to delete"), e) + _("Do not have permission to delete"), e) # TODO: remove from index entire subtree @@ -899,9 +883,9 @@ def _list_children_attr(self, nodeid, _path=None, _full=True): try: files = os.listdir(path) - except Exception, e: + except Exception as e: raise ConnectionError( - _(u"Do not have permission to read folder contents: %s") + _("Do not have permission to read folder contents: %s") % path, e) for filename in files: @@ -909,8 +893,8 @@ def _list_children_attr(self, nodeid, _path=None, _full=True): if os.path.exists(get_node_meta_file(path2)): try: yield self._read_node(nodeid, path2, _full=_full) - except ConnectionError, e: - keepnote.log_error(u"error reading %s" % path2) + except ConnectionError as e: + keepnote.log_error("error reading %s" % path2) continue # TODO: raise warning, not all children read @@ -999,7 +983,7 @@ def _reindex_node(self, nodeid, parentid, path, attr, mtime, warn=True): """Reindex a node that has been tampered""" if warn: keepnote.log_message( - u"Unmanaged change detected. Reindexing '%s'\n" % path) + "Unmanaged change detected. Reindexing '%s'\n" % path) # TODO: to prevent a full recurse I could index children but # use 0 for mtime, so that they will still trigger an index for them @@ -1027,7 +1011,7 @@ def _write_attr(self, filename, nodeid, attr): try: write_attr(filename, nodeid, self._attr_mask) - except Exception, e: + except Exception as e: raise raise ConnectionError( _("Cannot write meta data" + " " + filename + ":" + str(e)), e) @@ -1145,9 +1129,9 @@ def index(self, query): def index_attr(self, key, datatype, index_value=False): - if isinstance(datatype, basestring): + if isinstance(datatype, str): index_type = datatype - elif issubclass(datatype, basestring): + elif issubclass(datatype, str): index_type = "TEXT" elif issubclass(datatype, int): index_type = "INTEGER" @@ -1209,7 +1193,7 @@ def _clean_attr(self, nodeid, attr): 'parentids': [], 'childrenids': [], } - for key, value in defaults.items(): + for key, value in list(defaults.items()): if key not in attr: attr[key] = value if key not in masked: diff --git a/keepnote/notebook/connection/fs/file.py b/keepnote/notebook/connection/fs/file.py index 763ee6537..3aa6ad6d1 100644 --- a/keepnote/notebook/connection/fs/file.py +++ b/keepnote/notebook/connection/fs/file.py @@ -17,10 +17,8 @@ def get_node_filename(node_path, filename): node_path -- local path to a node filename -- node path to attached file """ - if filename.startswith("/"): filename = filename[1:] - return os.path.join(node_path, path_node2local(filename)) @@ -40,8 +38,8 @@ def get_node_path(self, nodeid): def open_file(self, nodeid, filename, mode="r", codec=None, _path=None): """Open a node file""" - if mode not in "rwa": - raise FileError("mode must be 'r', 'w', or 'a'") + if mode not in "rwa" and mode + "b" not in "rbwbab": # 检查合法模式 + raise FileError("mode must be 'r', 'w', 'a', 'rb', 'wb', or 'ab'") if filename.endswith("/"): raise FileError("filename '%s' cannot end with '/'" % filename) @@ -54,10 +52,9 @@ def open_file(self, nodeid, filename, mode="r", codec=None, _path=None): if not os.path.exists(dirpath): os.makedirs(dirpath) - # NOTE: always use binary mode to ensure no - # Window-specific line ending conversion - stream = safefile.open(fullname, mode + "b", codec=codec) - except Exception, e: + # 直接使用传入的 mode，不强制添加 "b" + stream = safefile.open(fullname, mode, codec=codec) + except Exception as e: raise FileError( "cannot open file '%s' '%s': %s" % (nodeid, filename, str(e)), e) @@ -77,7 +74,7 @@ def delete_file(self, nodeid, filename, _path=None): else: # filename may not exist, delete is successful by default pass - except Exception, e: + except Exception as e: raise FileError("error deleting file '%s' '%s'" % (nodeid, filename), e) @@ -92,7 +89,7 @@ def create_dir(self, nodeid, filename, _path=None): try: if not os.path.isdir(fullname): os.makedirs(fullname) - except Exception, e: + except Exception as e: raise FileError( "cannot create dir '%s' '%s'" % (nodeid, filename), e) @@ -111,13 +108,11 @@ def list_dir(self, nodeid, filename="/", _path=None): (nodeid, filename)) for name in filenames: - # TODO: extract this as a documented method. if (name != NODE_META_FILE and not name.startswith("__")): fullname = os.path.join(path, name) node_fullname = path_join(filename, name) if not os.path.exists(get_node_meta_file(fullname)): - # ensure directory is not a node if os.path.isdir(fullname): yield node_fullname + "/" else: @@ -139,15 +134,13 @@ def move_file(self, nodeid1, filename1, nodeid2, filename2, filepath1 = get_node_filename(path1, filename1) filepath2 = get_node_filename(path2, filename2) try: - # remove files in the way if os.path.isfile(filepath2): os.remove(filepath2) - if os.path.isdir(filename2): + if os.path.isdir(filepath2): # 修正可能的笔误 shutil.rmtree(filepath2) - # rename file os.rename(filepath1, filepath2) - except Exception, e: + except Exception as e: raise FileError("could not move file '%s' '%s'" % (nodeid1, filename1), e) @@ -158,7 +151,6 @@ def copy_file(self, nodeid1, filename1, nodeid2, filename2, If nodeid is None, filename is assumed to be a local file. """ - # Determine full filenames. if nodeid1 is None: fullname1 = filename1 else: @@ -175,9 +167,7 @@ def copy_file(self, nodeid1, filename1, nodeid2, filename2, if os.path.isfile(fullname1): shutil.copy(fullname1, fullname2) elif os.path.isdir(fullname1): - # TODO: handle case where filename1 = "/" and - # filename2 could be an existing directory shutil.copytree(fullname1, fullname2) - except Exception, e: + except Exception as e: raise FileError( - "unable to copy file '%s' '%s'" % (nodeid1, filename1), e) + "unable to copy file '%s' '%s'" % (nodeid1, filename1), e) \ No newline at end of file diff --git a/keepnote/notebook/connection/fs/index.py b/keepnote/notebook/connection/fs/index.py index 23150b285..770120f8c 100644 --- a/keepnote/notebook/connection/fs/index.py +++ b/keepnote/notebook/connection/fs/index.py @@ -5,25 +5,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports import os @@ -33,20 +14,20 @@ # import sqlite try: import pysqlite2.dbapi2 as sqlite -except Exception, e: +except Exception as e: import sqlite3 as sqlite #sqlite.enable_shared_cache(True) #sqlite.threadsafety = 0 -# keepnote imports +# keepnote.py imports import keepnote import keepnote.notebook from keepnote.notebook.connection.index import NodeIndex # index filename -INDEX_FILE = u"index.sqlite" +INDEX_FILE = "index.sqlite" INDEX_VERSION = 3 #============================================================================= @@ -87,7 +68,7 @@ def open(self, auto_clear=True): #self.con.execute(u"PRAGMA read_uncommitted = true;") self.init_index(auto_clear=auto_clear) - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -114,7 +95,7 @@ def save(self): self.con.commit() except: self.open() - except Exception, e: + except Exception as e: self._on_corrupt(e, sys.exc_info()[2]) def clear(self): @@ -131,17 +112,17 @@ def clear(self): def _get_version(self): """Get version from database""" - self.con.execute(u"""CREATE TABLE IF NOT EXISTS Version + self.con.execute("""CREATE TABLE IF NOT EXISTS Version (version INTEGER, update_date DATE);""") version = self.con.execute( - u"SELECT MAX(version) FROM Version").fetchone() + "SELECT MAX(version) FROM Version").fetchone() if version is not None: version = version[0] return version def _set_version(self, version=INDEX_VERSION): """Set the version of the database""" - self.con.execute(u"INSERT INTO Version VALUES (?, datetime('now'));", + self.con.execute("INSERT INTO Version VALUES (?, datetime('now'));", (version,)) def init_index(self, auto_clear=True): @@ -159,7 +140,7 @@ def init_index(self, auto_clear=True): self._need_index = True # init NodeGraph table - con.execute(u"""CREATE TABLE IF NOT EXISTS NodeGraph + con.execute("""CREATE TABLE IF NOT EXISTS NodeGraph (nodeid TEXT, parentid TEXT, basename TEXT, @@ -167,9 +148,9 @@ def init_index(self, auto_clear=True): symlink BOOLEAN, UNIQUE(nodeid) ON CONFLICT REPLACE); """) - con.execute(u"""CREATE INDEX IF NOT EXISTS IdxNodeGraphNodeid + con.execute("""CREATE INDEX IF NOT EXISTS IdxNodeGraphNodeid ON NodeGraph (nodeid);""") - con.execute(u"""CREATE INDEX IF NOT EXISTS IdxNodeGraphParentid + con.execute("""CREATE INDEX IF NOT EXISTS IdxNodeGraphParentid ON NodeGraph (parentid);""") # init attribute indexes @@ -181,7 +162,7 @@ def init_index(self, auto_clear=True): #if not self._need_index: # self._need_index = self.check_index() - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) keepnote.log_message("reinitializing index '%s'\n" % @@ -217,9 +198,9 @@ def _on_corrupt(self, error, tracebk=None): def _drop_tables(self): """drop NodeGraph tables""" - self.con.execute(u"DROP TABLE IF EXISTS NodeGraph") - self.con.execute(u"DROP INDEX IF EXISTS IdxNodeGraphNodeid") - self.con.execute(u"DROP INDEX IF EXISTS IdxNodeGraphParentid") + self.con.execute("DROP TABLE IF EXISTS NodeGraph") + self.con.execute("DROP INDEX IF EXISTS IdxNodeGraphNodeid") + self.con.execute("DROP INDEX IF EXISTS IdxNodeGraphParentid") self.drop_attrs(self.cur) def index_needed(self): @@ -274,7 +255,7 @@ def compact(self): def get_node_mtime(self, nodeid): """Get the last indexed mtime for a node""" - self.cur.execute(u"""SELECT mtime FROM NodeGraph + self.cur.execute("""SELECT mtime FROM NodeGraph WHERE nodeid=?""", (nodeid,)) row = self.cur.fetchone() if row: @@ -308,12 +289,12 @@ def add_node(self, nodeid, parentid, basename, attr, mtime, commit=False): # get info if parentid is None: parentid = self._uniroot - basename = u"" + basename = "" symlink = False # update nodegraph self.cur.execute( - u"""INSERT INTO NodeGraph VALUES (?, ?, ?, ?, ?)""", + """INSERT INTO NodeGraph VALUES (?, ?, ?, ?, ?)""", (nodeid, parentid, basename, mtime, symlink)) self.add_node_attr(self.cur, nodeid, attr) @@ -321,7 +302,7 @@ def add_node(self, nodeid, parentid, basename, attr, mtime, commit=False): if commit: self.con.commit() - except Exception, e: + except Exception as e: keepnote.log_error("error index node %s '%s'" % (nodeid, attr.get("title", ""))) self._on_corrupt(e, sys.exc_info()[2]) @@ -335,14 +316,14 @@ def remove_node(self, nodeid, commit=False): try: # delete node self.cur.execute( - u"DELETE FROM NodeGraph WHERE nodeid=?", (nodeid,)) + "DELETE FROM NodeGraph WHERE nodeid=?", (nodeid,)) self.remove_node_attr(self.cur, nodeid) if commit: self.con.commit() - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) #------------------------- @@ -362,7 +343,7 @@ def get_node_path(self, nodeid): # continue to walk up parent path.append(nodeid) - self.cur.execute(u"""SELECT nodeid, parentid, basename + self.cur.execute("""SELECT nodeid, parentid, basename FROM NodeGraph WHERE nodeid=?""", (nodeid,)) row = self.cur.fetchone() @@ -384,7 +365,7 @@ def get_node_path(self, nodeid): path.reverse() return path - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -401,7 +382,7 @@ def get_node_filepath(self, nodeid): while parentid != self._uniroot: # continue to walk up parent - self.cur.execute(u"""SELECT nodeid, parentid, basename + self.cur.execute("""SELECT nodeid, parentid, basename FROM NodeGraph WHERE nodeid=?""", (nodeid,)) row = self.cur.fetchone() @@ -425,7 +406,7 @@ def get_node_filepath(self, nodeid): path.reverse() return path - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -435,7 +416,7 @@ def get_node(self, nodeid): # TODO: handle multiple parents try: - self.cur.execute(u"""SELECT nodeid, parentid, basename, mtime + self.cur.execute("""SELECT nodeid, parentid, basename, mtime FROM NodeGraph WHERE nodeid=?""", (nodeid,)) row = self.cur.fetchone() @@ -449,7 +430,7 @@ def get_node(self, nodeid): "basename": row[2], "mtime": row[3]} - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -459,7 +440,7 @@ def get_attr(self, nodeid, attr): def has_node(self, nodeid): """Returns True if index has node""" - self.cur.execute(u"""SELECT nodeid, parentid, basename, mtime + self.cur.execute("""SELECT nodeid, parentid, basename, mtime FROM NodeGraph WHERE nodeid=?""", (nodeid,)) return self.cur.fetchone() is not None @@ -468,12 +449,12 @@ def list_children(self, nodeid): """List children indexed for node""" try: - self.cur.execute(u"""SELECT nodeid, basename + self.cur.execute("""SELECT nodeid, basename FROM NodeGraph WHERE parentid=?""", (nodeid,)) return list(self.cur.fetchall()) - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -481,12 +462,12 @@ def has_children(self, nodeid): """Returns True if node has children""" try: - self.cur.execute(u"""SELECT nodeid + self.cur.execute("""SELECT nodeid FROM NodeGraph WHERE parentid=?""", (nodeid,)) return self.cur.fetchone() is not None - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise @@ -495,7 +476,7 @@ def search_titles(self, title): try: return self.search_node_titles(self.cur, title) - except sqlite.DatabaseError, e: + except sqlite.DatabaseError as e: self._on_corrupt(e, sys.exc_info()[2]) raise diff --git a/keepnote/notebook/connection/fs/paths.py b/keepnote/notebook/connection/fs/paths.py index d0dc3606a..e6f306c89 100644 --- a/keepnote/notebook/connection/fs/paths.py +++ b/keepnote/notebook/connection/fs/paths.py @@ -2,7 +2,7 @@ # Constants. -NODE_META_FILE = u"node.xml" +NODE_META_FILE = "node.xml" def get_node_meta_file(nodepath): @@ -11,36 +11,16 @@ def get_node_meta_file(nodepath): def path_local2node(filename): - """ - Converts a local path to a node path - On unix: - aaa/bbb/ccc => aaa/bbb/ccc - - On windows: - - aaa\bbb\ccc => aaa/bbb/ccc - """ - - if os.path.sep == u"/": + if os.path.sep == "/": return filename - return filename.replace(os.path.sep, u"/") + return filename.replace(os.path.sep, "/") def path_node2local(filename): - """ - Converts a node path to a local path - - On unix: - - aaa/bbb/ccc => aaa/bbb/ccc - - On windows: - aaa/bbb/ccc => aaa\bbb\ccc - """ - if os.path.sep == u"/": + if os.path.sep == "/": return filename - return filename.replace(u"/", os.path.sep) + return filename.replace("/", os.path.sep) diff --git a/keepnote/notebook/connection/fs_raw.py b/keepnote/notebook/connection/fs_raw.py index 07227624e..301a3dbd1 100644 --- a/keepnote/notebook/connection/fs_raw.py +++ b/keepnote/notebook/connection/fs_raw.py @@ -6,25 +6,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports import logging import os @@ -32,7 +13,7 @@ import re import uuid -# keepnote imports +# keepnote.py imports from keepnote import sqlitedict from keepnote import trans from keepnote.notebook.connection import NodeExists @@ -49,13 +30,13 @@ # constants -XML_HEADER = u"""\ +XML_HEADER = """\ """ -NODE_META_FILE = u"node.xml" -NOTEBOOK_META_DIR = u"__NOTEBOOK__" -NODEDIR = u"nodes" +NODE_META_FILE = "node.xml" +NOTEBOOK_META_DIR = "__NOTEBOOK__" +NODEDIR = "nodes" MAX_LEN_NODE_FILENAME = 40 NULL = object() @@ -79,7 +60,7 @@ class NodeFSSimple(object): VALID_REGEX = re.compile(r'^[a-z0-9_\-., "\']+$') def __init__(self, rootpath): - self._rootpath = unicode(rootpath) + self._rootpath = str(rootpath) self._fansize = 2 def _is_valid(self, nodeid): @@ -251,7 +232,7 @@ def _get_alt_nodeid(self, nodeid): # Determine alternate nodeid for this nonstandard nodeid. alt_nodeid = self._index.get(nodeid, None) if not alt_nodeid: - alt_nodeid = unicode(uuid.uuid4()) + alt_nodeid = str(uuid.uuid4()) self._index[nodeid] = alt_nodeid self._index_alt[alt_nodeid] = nodeid self._index.commit() diff --git a/keepnote/notebook/connection/http.py b/keepnote/notebook/connection/http.py index ffc3c4c16..6af8282bf 100644 --- a/keepnote/notebook/connection/http.py +++ b/keepnote/notebook/connection/http.py @@ -6,40 +6,23 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# + # python imports from collections import defaultdict import contextlib -import httplib +import http.client import json -import urllib -import urlparse +import urllib.request, urllib.parse, urllib.error +import urllib.parse -# keepnote imports +# keepnote.py imports from keepnote import plist import keepnote.notebook.connection as connlib from keepnote.notebook.connection import NoteBookConnection -XML_HEADER = u"""\ +XML_HEADER = """\ """ @@ -69,14 +52,14 @@ def parse_node_path(path, prefixes=("/")): i = path.find("/") if i != -1: nodeid = path[:i] - filename = urllib.unquote(path[i+1:]) + filename = urllib.parse.unquote(path[i+1:]) if filename == "": filename = "/" else: nodeid = path filename = None - return urllib.unquote(nodeid), filename + return urllib.parse.unquote(nodeid), filename def format_node_path(prefix, nodeid="", filename=None): @@ -85,9 +68,9 @@ def format_node_path(prefix, nodeid="", filename=None): """ nodeid = nodeid.replace("/", "%2F") if filename is not None: - return urllib.quote("%s%s/%s" % (prefix, nodeid, filename)) + return urllib.parse.quote("%s%s/%s" % (prefix, nodeid, filename)) else: - return urllib.quote(prefix + nodeid) + return urllib.parse.quote(prefix + nodeid) def format_node_url(host, prefix, nodeid, filename=None, port=80): @@ -109,12 +92,12 @@ def __init__(self, version=2): self._version = version def connect(self, url): - parts = urlparse.urlsplit(url) + parts = urllib.parse.urlsplit(url) self._netloc = parts.netloc self._prefix = parts.path + 'nodes/' self._notebook_prefix = parts.path - self._conn = httplib.HTTPConnection(self._netloc) + self._conn = http.client.HTTPConnection(self._netloc) self._title_cache.clear() #self._conn.set_debuglevel(1) @@ -132,9 +115,9 @@ def save(self): def _request(self, action, url, body=None, headers={}): try: return self._conn.request(action, url, body, headers) - except httplib.ImproperConnectionState: + except http.client.ImproperConnectionState: # restart connection - self._conn = httplib.HTTPConnection(self._netloc) + self._conn = http.client.HTTPConnection(self._netloc) return self._request(action, url, body, headers) def load_data(self, stream): @@ -163,9 +146,9 @@ def create_node(self, nodeid, attr): self._request('POST', format_node_path(self._prefix, nodeid), body_content) result = self._conn.getresponse() - if result.status == httplib.FORBIDDEN: + if result.status == http.client.FORBIDDEN: raise connlib.NodeExists() - elif result.status != httplib.OK: + elif result.status != http.client.OK: raise connlib.ConnectionError("unexpected error") self._title_cache.update_attr(attr) @@ -174,12 +157,12 @@ def read_node(self, nodeid): self._request('GET', format_node_path(self._prefix, nodeid)) result = self._conn.getresponse() - if result.status == httplib.OK: + if result.status == http.client.OK: try: attr = self.load_data(result) self._title_cache.update_attr(attr) return attr - except Exception, e: + except Exception as e: raise connlib.ConnectionError( "unexpected error '%s'" % str(e), e) else: @@ -191,9 +174,9 @@ def update_node(self, nodeid, attr): self._request('PUT', format_node_path(self._prefix, nodeid), body_content) result = self._conn.getresponse() - if result.status == httplib.NOT_FOUND: + if result.status == http.client.NOT_FOUND: raise connlib.UnknownNode() - elif result.status != httplib.OK: + elif result.status != http.client.OK: raise connlib.ConnectionError() self._title_cache.update_attr(attr) @@ -201,9 +184,9 @@ def delete_node(self, nodeid): self._request('DELETE', format_node_path(self._prefix, nodeid)) result = self._conn.getresponse() - if result.status == httplib.NOT_FOUND: + if result.status == http.client.NOT_FOUND: raise connlib.UnknownNode() - elif result.status != httplib.OK: + elif result.status != http.client.OK: raise connlib.ConnectionError() self._title_cache.remove(nodeid) @@ -213,7 +196,7 @@ def has_node(self, nodeid): # HEAD nodeid/filename self._request('HEAD', format_node_path(self._prefix, nodeid)) result = self._conn.getresponse() - return result.status == httplib.OK + return result.status == http.client.OK def get_rootid(self): """Returns nodeid of notebook root node""" @@ -221,9 +204,9 @@ def get_rootid(self): self._request('GET', format_node_path(self._prefix)) result = self._conn.getresponse() - if result.status == httplib.NOT_FOUND: + if result.status == http.client.NOT_FOUND: raise connlib.UnknownNode() - if result.status != httplib.OK: + if result.status != http.client.OK: raise connlib.ConnectionError() # Currently only the first rootid is returned. @@ -268,7 +251,7 @@ def __exit__(self, type, value, tb): self._request( 'GET', format_node_path(self._prefix, nodeid, filename)) result = self._conn.getresponse() - if result.status == httplib.OK: + if result.status == http.client.OK: stream = contextlib.closing(result) stream.read = result.read stream.close = result.close @@ -310,7 +293,7 @@ def delete_file(self, nodeid, filename): self._request( 'DELETE', format_node_path(self._prefix, nodeid, filename)) result = self._conn.getresponse() - if result.status != httplib.OK: + if result.status != http.client.OK: raise connlib.FileError() def create_dir(self, nodeid, filename): @@ -323,7 +306,7 @@ def create_dir(self, nodeid, filename): self._request( 'PUT', format_node_path(self._prefix, nodeid, filename)) result = self._conn.getresponse() - if result.status != httplib.OK: + if result.status != http.client.OK: raise connlib.FileError() def list_dir(self, nodeid, filename="/"): @@ -338,14 +321,14 @@ def list_dir(self, nodeid, filename="/"): self._request( 'GET', format_node_path(self._prefix, nodeid, filename)) result = self._conn.getresponse() - if result.status == httplib.OK: + if result.status == http.client.OK: try: if self._version == 1: return self.load_data(result) else: data = self.load_data(result) return data['files'] - except Exception, e: + except Exception as e: raise connlib.ConnectionError( "unexpected response '%s'" % str(e), e) else: @@ -357,7 +340,7 @@ def has_file(self, nodeid, filename): self._request( 'HEAD', format_node_path(self._prefix, nodeid, filename)) result = self._conn.getresponse() - return result.status == httplib.OK + return result.status == http.client.OK #--------------------------------- # indexing/querying @@ -370,10 +353,10 @@ def index_raw(self, query): 'POST', format_node_path(self._notebook_prefix) + "?index", body_content) result = self._conn.getresponse() - if result.status == httplib.OK: + if result.status == http.client.OK: try: return self.load_data(result) - except Exception, e: + except Exception as e: raise connlib.ConnectionError( "unexpected response '%s'" % str(e), e) @@ -456,7 +439,7 @@ def remove(self, nodeid): def get(self, query): query = query.lower() - for title in self._titles.iterkeys(): + for title in self._titles.keys(): if query in title: for nodeid in self._titles[title]: yield (nodeid, self._nodeids[nodeid]) diff --git a/keepnote/notebook/connection/index.py b/keepnote/notebook/connection/index.py index 7a8b90b81..15faf4406 100644 --- a/keepnote/notebook/connection/index.py +++ b/keepnote/notebook/connection/index.py @@ -5,37 +5,11 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# # python imports from itertools import chain - -#try: -# import pysqlite2.dbapi2 as sqlite -#except ImportError: -# pass -#sqlite.enable_shared_cache(True) -#sqlite.threadsafety = 0 - -# keepnote imports +# keepnote.py imports import keepnote import keepnote.notebook @@ -57,7 +31,7 @@ def match_words(infile, words): matches[word] = True # return True if all words are found (AND) - for val in matches.itervalues(): + for val in matches.values(): if not val: return False @@ -84,7 +58,7 @@ def test_fts3(cur, tmpname="fts3test"): # full text table try: # test for fts3 availability - cur.execute(u"DROP TABLE IF EXISTS %s;" % tmpname) + cur.execute("DROP TABLE IF EXISTS %s;" % tmpname) cur.execute( "CREATE VIRTUAL TABLE %s USING fts3(col TEXT);" % tmpname) cur.execute("DROP TABLE %s;" % tmpname) @@ -115,22 +89,22 @@ def get_table_name(self): def init(self, cur): """Initialize attribute index for database""" - cur.execute(u"""CREATE TABLE IF NOT EXISTS %s + cur.execute("""CREATE TABLE IF NOT EXISTS %s (nodeid TEXT, value %s, UNIQUE(nodeid) ON CONFLICT REPLACE); """ % (self._table_name, self._type)) - cur.execute(u"""CREATE INDEX IF NOT EXISTS %s + cur.execute("""CREATE INDEX IF NOT EXISTS %s ON %s (nodeid);""" % (self._index_name, self._table_name)) if self._index_value: - cur.execute(u"""CREATE INDEX IF NOT EXISTS %s + cur.execute("""CREATE INDEX IF NOT EXISTS %s ON %s (value);""" % (self._index_value_name, self._table_name)) def drop(self, cur): - cur.execute(u"DROP TABLE IF EXISTS %s" % self._table_name) + cur.execute("DROP TABLE IF EXISTS %s" % self._table_name) def add_node(self, cur, nodeid, attr): val = attr.get(self._name, NULL) @@ -139,12 +113,12 @@ def add_node(self, cur, nodeid, attr): def remove_node(self, cur, nodeid): """Remove node from index""" - cur.execute(u"DELETE FROM %s WHERE nodeid=?" % self._table_name, + cur.execute("DELETE FROM %s WHERE nodeid=?" % self._table_name, (nodeid,)) def get(self, cur, nodeid): """Get information for a node from the index""" - cur.execute(u"""SELECT value FROM %s WHERE nodeid = ?""" % + cur.execute("""SELECT value FROM %s WHERE nodeid = ?""" % self._table_name, (nodeid,)) values = [row[0] for row in cur.fetchall()] @@ -158,7 +132,7 @@ def set(self, cur, nodeid, value): """Set the information for a node in the index""" # insert new row - cur.execute(u"""INSERT INTO %s VALUES (?, ?)""" % self._table_name, + cur.execute("""INSERT INTO %s VALUES (?, ?)""" % self._table_name, (nodeid, value)) @@ -217,9 +191,9 @@ def init_attrs(self, cur): # full text table if test_fts3(cur): # create fulltext table if it does not already exist - if not list(cur.execute(u"""SELECT 1 FROM sqlite_master + if not list(cur.execute("""SELECT 1 FROM sqlite_master WHERE name == 'fulltext';""")): - cur.execute(u"""CREATE VIRTUAL TABLE + cur.execute("""CREATE VIRTUAL TABLE fulltext USING fts3(nodeid TEXT, content TEXT, tokenize=porter);""") @@ -236,19 +210,19 @@ def init_attrs(self, cur): # """) # initialize attribute tables - for attr in self._attrs.itervalues(): + for attr in self._attrs.values(): attr.init(cur) def drop_attrs(self, cur): - cur.execute(u"DROP TABLE IF EXISTS fulltext;") + cur.execute("DROP TABLE IF EXISTS fulltext;") # drop attribute tables table_names = [x for (x,) in cur.execute( - u"""SELECT name FROM sqlite_master WHERE name LIKE 'Attr_%'""")] + """SELECT name FROM sqlite_master WHERE name LIKE 'Attr_%'""")] for table_name in table_names: - cur.execute(u"""DROP TABLE %s;""" % table_name) + cur.execute("""DROP TABLE %s;""" % table_name) #=============================== # add/remove/get nodes from index @@ -256,7 +230,7 @@ def drop_attrs(self, cur): def add_node_attr(self, cur, nodeid, attr, fulltext=True): # update attrs - for attrindex in self._attrs.itervalues(): + for attrindex in self._attrs.values(): attrindex.add_node(cur, nodeid, attr) # update fulltext @@ -267,7 +241,7 @@ def add_node_attr(self, cur, nodeid, attr, fulltext=True): def remove_node_attr(self, cur, nodeid): # update attrs - for attr in self._attrs.itervalues(): + for attr in self._attrs.values(): attr.remove_node(cur, nodeid) self._remove_text(cur, nodeid) @@ -334,10 +308,10 @@ def search_node_titles(self, cur, query): # order titles by exact matches and then alphabetically cur.execute( - u"""SELECT nodeid, value FROM %s WHERE value LIKE ? + """SELECT nodeid, value FROM %s WHERE value LIKE ? ORDER BY value != ?, value """ % self.get_attr_index("title").get_table_name(), - (u"%" + query + u"%", query)) + ("%" + query + "%", query)) return list(cur.fetchall()) @@ -354,12 +328,12 @@ def _insert_text(self, cur, nodeid, text): if not self._has_fulltext: return - if list(cur.execute(u"SELECT 1 FROM fulltext WHERE nodeid = ?", + if list(cur.execute("SELECT 1 FROM fulltext WHERE nodeid = ?", (nodeid,))): - cur.execute(u"UPDATE fulltext SET content = ? WHERE nodeid = ?;", + cur.execute("UPDATE fulltext SET content = ? WHERE nodeid = ?;", (text, nodeid)) else: - cur.execute(u"INSERT INTO fulltext VALUES (?, ?);", + cur.execute("INSERT INTO fulltext VALUES (?, ?);", (nodeid, text)) def _remove_text(self, cur, nodeid): @@ -367,4 +341,4 @@ def _remove_text(self, cur, nodeid): if not self._has_fulltext: return - cur.execute(u"DELETE FROM fulltext WHERE nodeid = ?", (nodeid,)) + cur.execute("DELETE FROM fulltext WHERE nodeid = ?", (nodeid,)) diff --git a/keepnote/notebook/connection/mem.py b/keepnote/notebook/connection/mem.py index 01d859b39..f8a1b713c 100644 --- a/keepnote/notebook/connection/mem.py +++ b/keepnote/notebook/connection/mem.py @@ -8,28 +8,10 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - -from StringIO import StringIO - -# keepnote imports + +from io import StringIO + +# keepnote.py imports import keepnote.notebook.connection as connlib from keepnote.notebook.connection import NoteBookConnection @@ -178,7 +160,7 @@ def list_dir(self, nodeid, filename="/"): raise connlib.FileError() seen = set() - for name in node.files.iterkeys(): + for name in node.files.keys(): if name.startswith(filename) and name != filename: part = name[len(filename):] index = part.find('/') @@ -218,7 +200,7 @@ def index(self, query): elif query[0] == "search": assert query[1] == "title" return [(nodeid, node.attr["title"]) - for nodeid, node in self._nodes.iteritems() + for nodeid, node in self._nodes.items() if query[2] in node.attr.get("title", "")] elif query[0] == "search_fulltext": diff --git a/keepnote/notebook/sync.py b/keepnote/notebook/sync.py index 629f25c97..3f8393904 100644 --- a/keepnote/notebook/sync.py +++ b/keepnote/notebook/sync.py @@ -6,25 +6,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - from keepnote.notebook.connection import NodeExists from keepnote.notebook.connection import path_join diff --git a/keepnote/notebook/update.py b/keepnote/notebook/update.py index cbd554408..962f73c5a 100644 --- a/keepnote/notebook/update.py +++ b/keepnote/notebook/update.py @@ -5,24 +5,7 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# + import os @@ -69,7 +52,7 @@ def walk(node): try: node._version = 3 node.write_meta_data() - except Exception, e: + except Exception as e: if not warn(e): raise notebooklib.NoteBookError( "Could not update notebook", e) diff --git a/keepnote/orderdict.py b/keepnote/orderdict.py index bdcc99f86..64a1716d4 100644 --- a/keepnote/orderdict.py +++ b/keepnote/orderdict.py @@ -3,25 +3,6 @@ OrderDict module """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - class OrderDict (dict): """ @@ -37,7 +18,7 @@ def __init__(self, *args, **kargs): dict.__setitem__(self, k, v) else: dict.__init__(self, *args, **kargs) - self._order = dict.keys(self) + self._order = list(dict.keys(self)) # Convert dict_keys to list # The following methods keep names in sync with dictionary keys def __setitem__(self, key, value): diff --git a/keepnote/plist.py b/keepnote/plist.py index 106a8e5c2..53329cf79 100644 --- a/keepnote/plist.py +++ b/keepnote/plist.py @@ -7,32 +7,13 @@ - added null type """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports try: import xml.etree.cElementTree as ET except ImportError: import xml.etree.elementtree.ElementTree as ET -from StringIO import StringIO +from io import StringIO import base64 import datetime import re @@ -60,12 +41,12 @@ def __init__(self, text): "array": lambda x: [v.text for v in x], "dict": lambda x: OrderDict( (x[i].text, x[i+1].text) for i in range(0, len(x), 2)), - "key": lambda x: x.text or u"", + "key": lambda x: x.text or "", # simple types - "string": lambda x: x.text or u"", - "data": lambda x: Data(base64.decodestring(x.text or u"")), - "date": lambda x: datetime.datetime(*map(int, re.findall("\d+", x.text))), + "string": lambda x: x.text or "", + "data": lambda x: Data(base64.decodestring(x.text or "")), + "date": lambda x: datetime.datetime(*list(map(int, re.findall("\\d+", x.text)))), "true": lambda x: True, "false": lambda x: False, "real": lambda x: float(x.text), @@ -115,50 +96,50 @@ def dump(elm, out=sys.stdout, indent=0, depth=0, suppress=False): out.write(" " * depth) if isinstance(elm, dict): - out.write(u"") + out.write("") if indent: - out.write(u"\n") - for key, val in elm.iteritems(): + out.write("\n") + for key, val in elm.items(): if indent: out.write(" " * (depth + indent)) - out.write(u"%s" % key) + out.write("%s" % key) dump(val, out, indent, depth+indent, suppress=True) if indent: out.write(" " * depth) - out.write(u"") + out.write("") elif isinstance(elm, (list, tuple)): - out.write(u"") + out.write("") if indent: - out.write(u"\n") + out.write("\n") for item in elm: dump(item, out, indent, depth+indent) if indent: out.write(" " * depth) - out.write(u"") + out.write("") - elif isinstance(elm, basestring): - out.write(u"%s" % escape(elm)) + elif isinstance(elm, str): + out.write("%s" % escape(elm)) elif isinstance(elm, bool): if elm: - out.write(u"") + out.write("") else: - out.write(u"") + out.write("") - elif isinstance(elm, (int, long)): - out.write(u"%d" % elm) + elif isinstance(elm, int): + out.write("%d" % elm) elif isinstance(elm, float): - out.write(u"%f" % elm) + out.write("%f" % elm) elif elm is None: - out.write(u"") + out.write("") elif isinstance(elm, Data): - out.write(u"") + out.write("") base64.encode(StringIO(elm), out) - out.write(u"") + out.write("") elif isinstance(elm, datetime.datetime): raise Exception("not implemented") @@ -168,7 +149,7 @@ def dump(elm, out=sys.stdout, indent=0, depth=0, suppress=False): (str(type(elm)), str(elm))) if indent: - out.write(u"\n") + out.write("\n") def dumps(elm, indent=0): @@ -177,50 +158,27 @@ def dumps(elm, indent=0): return s.getvalue() -def dump_etree(elm): - if isinstance(elm, dict): - elm2 = ET.Element("dict") - for key, val in elm.iteritems(): - key2 = ET.Element("key") - key2.text = key - elm2.append(key2) - elm2.append(dump_etree(val)) - - elif isinstance(elm, (list, tuple)): - elm2 = ET.Element("array") - for item in elm: - elm2.append(dump_etree(item)) - - elif isinstance(elm, basestring): - elm2 = ET.Element("string") - elm2.text = elm - - elif isinstance(elm, bool): - if elm: - elm2 = ET.Element("true") +# In keepnote.py.plist +def dump_etree(data, element=None): + if element is None: + element = ET.Element("dict") + # Serialize data into element + for key, value in data.items(): + key_elem = ET.SubElement(element, "key") + key_elem.text = key + if isinstance(value, dict): + value_elem = ET.SubElement(element, "dict") + dump_etree(value, value_elem) + elif isinstance(value, list): + value_elem = ET.SubElement(element, "array") + for item in value: + if isinstance(item, dict): + item_elem = ET.SubElement(value_elem, "dict") + dump_etree(item, item_elem) + else: + item_elem = ET.SubElement(value_elem, "string") + item_elem.text = str(item) else: - elm2 = ET.Element("false") - - elif isinstance(elm, int): - elm2 = ET.Element("integer") - elm2.text = str(elm) - - elif isinstance(elm, float): - elm2 = ET.Element("real") - elm2.text = str(elm) - - elif elm is None: - elm2 = ET.Element("null") - - elif isinstance(elm, Data): - elm2 = ET.Element("data") - elm2.text = base64.encodestring(elm) - - elif isinstance(elm, datetime.datetime): - raise Exception("not implemented") - - else: - raise Exception("unknown data type '%s' for value '%s'" % - (str(type(elm)), str(elm))) - - return elm2 + value_elem = ET.SubElement(element, "string") + value_elem.text = str(value) + return element diff --git a/keepnote/pref.py b/keepnote/pref.py index 11a293ebc..60c18219c 100644 --- a/keepnote/pref.py +++ b/keepnote/pref.py @@ -4,25 +4,7 @@ Preference data structure """ - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# +from email.policy import default from keepnote import orderdict @@ -66,7 +48,10 @@ def get_pref(pref, *args, **kargs): # no default or define specified # all keys are expected to be present for arg in args: - d = d[arg] + if isinstance(arg, str) and arg in d: + d = d[arg] + else: + return default # check type if "type" in kargs and "default" in kargs: @@ -76,7 +61,8 @@ def get_pref(pref, *args, **kargs): return d except KeyError: - raise Exception("unknown config value '%s'" % ".".join(args)) + raise Exception("unknown config value '%s'" % ".".join(str(a) for a in args)) + def set_pref(pref, *args): diff --git a/keepnote/rc/keepnote.glade b/keepnote/rc/keepnote.glade index e262191b7..502cacf4d 100644 --- a/keepnote/rc/keepnote.glade +++ b/keepnote/rc/keepnote.glade @@ -1,208 +1,340 @@ - - - - - - GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - Find/Replace - True - GDK_WINDOW_TYPE_HINT_DIALOG - - - + + + + + + + + False + False + KeepNote + 800 + 600 + + True + False + vertical - + + True - 10 - 5 + False - + True - 2 - 2 - 5 - 5 - - - True - True - Replace Text: - True - 0 - True - - - - 1 - 2 - - - - - - + False + _File + True + + True - True - - - - 1 - 2 - 1 - 2 - - + False + + + True + False + New Notebook + True + + + + + True + False + Open Notebook... + True + + + + + True + False + Save + True + + + + + True + False + Close + True + + + + + True + False + + + + + True + False + Quit + True + + + - - + + + + + True + False + _Edit + True + + True - True - True - - - 1 - 2 - - + False + + + True + False + Undo + True + + + + + True + False + Redo + True + + + + + + + + + False + False + 0 + + + + + True + False + Main1 Window Content + + + True + True + 1 + + + + + + + + + False + False + KeepNote Options + dialog + main_window + + + True + False + vertical + 6 + + + True + True + True + True + + + True + True + 0 + + + + + True + True + True + True + + + True + True + 1 + + + + + True + False + horizontal + 6 + end + + + True + True + True - + True - 1 - Find Text: - GTK_JUSTIFY_RIGHT - - - - - + False + horizontal + 4 + + + True + False + gtk-ok + + + + + True + False + OK + + + - + False + False + 0 - + True - 2 - 2 - - - True - 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - Sea_rch Forward - True - 0 - 0 - True - True - - - GTK_FILL - - - + True + True - + True - True - Search _Backward - True - 0 - 0 - True - forward_button - - - 1 - 2 - GTK_FILL - - - - - - True - True - Case _Sensitive - True - 0 - 0 - True - - - 1 - 2 - - GTK_FILL - + False + horizontal + 4 + + + True + False + gtk-cancel + + + + + True + False + Cancel + + + - + False + False 1 - + True - + True + True + + + True + False + horizontal + 4 + + + True + False + gtk-apply + + + + + True + False + Apply + + + + + False False 2 - + + False + False 2 - - + + + + + + + True + False + General + 0 + none + + + True + False + 10 + 10 + 10 + + True - GTK_BUTTONBOX_END + False + vertical + 6 - + True - True - _Close - True - 0 - - - + True + Use last notebook + True + default_notebook_radio + False False + 0 - + True - True - _Replace - True - 0 - - - + True + No default notebook + True + default_notebook_radio + False False @@ -210,14 +342,12 @@ - + True - True - Replace _All - True - 0 - - + True + Default notebook: + True + False False @@ -225,2687 +355,516 @@ - - True - True - True - True - _Find - True - 0 - - - - - - False - False - 3 - - - - - False - GTK_PACK_END - - - - - - - 700 - 450 - KeepNote Preferences - True - GTK_WIN_POS_CENTER_ON_PARENT - True - GDK_WINDOW_TYPE_HINT_NORMAL - False - - - True - GTK_ORIENTATION_VERTICAL - 2 - GTK_ORIENTATION_VERTICAL - - - True - - - 200 + True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN + False + 1 + 2 - + True - True - False - + True + True + + + 0 + 0 + - - - False - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - + True - GTK_RESIZE_QUEUE - GTK_SHADOW_NONE + True - + True - 5 - 5 - 5 - 5 + False + horizontal + 4 + + + True + False + gtk-open + + - + True - True - False - False - 0 - 0 - 0 - + False + Browse + - + - + + + 1 + 0 + - + - 5 - 1 + False + False + 10 + 3 - - - 1 - - - - - True - GTK_BUTTONBOX_END - + True - True - _Cancel - True - 1 - - + True + Autosave every: + True + False False + 4 - + True - True - True - True - _Apply - True - 0 - - - + False + horizontal + 6 + + + True + True + 5 + + + False + False + 0 + + + + + True + False + seconds + + + False + False + 1 + + + False False - 1 + 10 + 5 - + True - True - True - True - _Ok - True - 0 - - - + True + Use system tray + True + False False - 2 + 6 - - - False - GTK_PACK_END - - - - - - - Resize Image - True - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - - - True - 10 - 10 - 10 - 10 - + True - 5 + False + vertical + 6 - + True - 2 - 3 - 5 - 5 - - - True - True - 3 - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - 3 - - - - 1 - 2 - GTK_FILL - - - - - True - True - 150 1 1000 10 50 10 - GTK_SENSITIVITY_ON - GTK_SENSITIVITY_ON - False - GTK_POS_LEFT - - - - 2 - 3 - 1 - 2 - - - - - True - True - 150 1 1000 10 50 10 - GTK_SENSITIVITY_ON - GTK_SENSITIVITY_ON - False - GTK_POS_LEFT - - - - 2 - 3 - - - - - True - 0 - height: - - - 1 - 2 - GTK_FILL - - - - - True - 0 - width: - - - GTK_FILL - - - + True + Skip taskbar + True + + + False + False + 0 + - + True - - - True - - - - - True - - - True - - - True - True - Snap: - 0 - 0 - True - - - - False - False - - - - - True - True - 4 - 50 - - - - False - False - 1 - - - - - False - - - - - True - True - Keep aspect ratio - True - 0 - True - True - - - - False - False - 1 - - - - - False - False - 1 - - - - - True - - - 2 - - - + True + Minimize on start + True + False False 1 - - - - - False - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-revert-to-saved - True - -2 - + False False + 10 + 7 - + True - True - True - gtk-apply - True - -10 - + True + Keep above other windows + True + False False - 1 + 8 - + True - True - True - gtk-cancel - True - -6 - + True + Stick to all workspaces + True + False False - 2 + 9 - + True - True - True - True - gtk-ok - True - -5 - + True + Use fulltext search + True + False False - 3 + 10 - - - False - GTK_PACK_END - + - + - - - 500 - 5 - False - True - GTK_WIN_POS_CENTER_ON_PARENT - 500 - True - GDK_WINDOW_TYPE_HINT_DIALOG - False - False - - + + + + + True + False + Look and Feel + 0 + none + + True - 2 + False + 10 + 10 + 10 - + True + False + vertical + 6 - - 400 - True - 0 - True - 400 - - - - + True - - - False - 1 - + False + Look and Feel Options + - - - 1 - + - - + + + + + + + True + False + Language + 0 + none + + + True + False + 10 + 10 + 10 + + True - GTK_BUTTONBOX_END + False + vertical + 6 - + True - True - True - _Cancel - True - 0 - - - - False - False - + False + Language Options + - - - False - GTK_PACK_END - + - + - - - 5 - Notebook Update - False - True - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - False - - + + + + + True + False + Date and Time + 0 + none + + True - 2 + False + 10 + 10 + 10 - + True - 5 + False + vertical + 6 - + True - <b>Notebook Update</b> - True - GTK_JUSTIFY_CENTER - - - False - + False + Date and Time Options + - - - True - This notebook has format version 1 and must be updated to version 2 before openning. - True - - - False - False - 1 - - - - - True - 14 - - - True - True - save backup before updating (recommended) - 0 - True - True - - - - - False - 2 - - - - - False - 1 - + + + + + + + + True + False + Editor + 0 + none + + + True + False + 10 + 10 + 10 - + True - <i>note: backup and upgrade may take a while for larger notebooks.</i> - True - GTK_JUSTIFY_CENTER - True - - - False - False - 22 - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - False - False - - + False + vertical + 6 - + True - True - True - True - True - gtk-ok - True - -5 - - - False - False - 1 - + False + Editor Options + - - - False - GTK_PACK_END - + - + - - - 5 - New Icon - True - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_NORMAL - False - - + + + + + True + False + Helper Applications + 0 + none + + True - GTK_ORIENTATION_VERTICAL - 2 - GTK_ORIENTATION_VERTICAL + False + 10 + 10 + 10 - + True - GTK_ORIENTATION_VERTICAL - 5 - GTK_ORIENTATION_VERTICAL - - - True - 0 - - - True - 5 - 5 - 10 - 5 - - - True - 2 - 5 - 6 - 5 - - - True - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-open - 2 - - - False - False - - - - - True - 5 - Browse... - True - - - False - False - 1 - - - - - - - - - 2 - 3 - 1 - 2 - - - - - - - True - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-open - 2 - - - False - False - - - - - True - 5 - Browse... - True - - - False - False - 1 - - - - - - - - - 2 - 3 - - - - - - - True - gtk-missing-image - - - 3 - 4 - - - - - - - True - gtk-missing-image - - - 3 - 4 - 1 - 2 - - - - - - - True - True - 30 - - - 1 - 2 - - - - - - - True - True - 30 - - - 1 - 2 - 1 - 2 - - - - - - - True - 1 - icon: - GTK_JUSTIFY_RIGHT - - - GTK_FILL - - - - - - True - 1 - open-icon: - GTK_JUSTIFY_RIGHT - - - 1 - 2 - GTK_FILL - - - - - - True - - - 4 - 5 - - - - - - True - - - 4 - 5 - 1 - 2 - - - - - - - - - - True - <b>Node icons</b> - True - - - label_item - - - - - False - False - - + False + vertical + 6 - + True - 0 - - - True - 5 - 5 - 5 - 5 - - - True - GTK_ORIENTATION_VERTICAL - 8 - GTK_ORIENTATION_VERTICAL - - - True - 5 - True - - - True - True - True - 0 - - - - True - 0 - - - True - 5 - - - True - folder.png - - - False - - - - - True - set icon - - - False - 1 - - - - - - - - - - - True - True - True - 0 - - - - True - 0 - - - True - 5 - - - True - folder-open.png - - - False - - - - - True - set open-icon - - - False - 1 - - - - - - - - - 1 - - - - - True - True - True - 0 - - - - True - 0 - - - True - 5 - - - True - trash.png - - - False - - - - - True - delete icon - - - False - 1 - - - - - - - - - 2 - - - - - False - - - - - True - - - True - 0 - GTK_SHADOW_NONE - - - True - 0.94999998807907104 - 5 - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - GTK_SHADOW_NONE - - - True - GTK_ORIENTATION_VERTICAL - GTK_ORIENTATION_VERTICAL - - - True - Standard Icons - - - False - False - - - - - True - True - - - 1 - - - - - True - Notebook-specific Icons - - - False - False - 2 - - - - - True - True - - - 3 - - - - - - - - - - - - - True - <b>All Available icons</b> - True - - - label_item - - - - - - - True - 3 - - - True - - - - - True - True - True - GTK_RELIEF_NONE - 0 - - - - True - gtk-go-forward - - - - - False - False - 1 - - - - - True - - - 2 - - - - - False - False - 1 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 5 - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - 200 - True - True - True - - - - - - - - - True - <b>Quick pick icons</b> - True - - - label_item - - - - - 2 - - - - - 1 - - - - - - - - - True - <b>Manage icons</b> - True - - - label_item - - - - - 1 - + False + Helper Applications Options + - - - 1 - + - - + + + + + + + True + False + Notebook Options + 0 + none + + + True + False + 10 + 10 + 10 + + True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - False - False - - + False + vertical + 6 - + True - True - True - gtk-ok - True - -5 - - - False - False - 1 - + False + Notebook Options + - - - False - GTK_PACK_END - + - + - - + + + + + True + False + Extensions + 0 + none - + True - 0 - GTK_SHADOW_NONE + False + 10 + 10 + 10 - + True - 10 - 10 + False + vertical + 6 - + True - 10 - GTK_ORIENTATION_VERTICAL - 5 - GTK_ORIENTATION_VERTICAL - - - True - 0 - GTK_SHADOW_NONE - - - True - 10 - - - True - 3 - 2 - 5 - 5 - - - True - True - Default Notebook: - 0 - 0 - 0 - True - True - no_default_notebook_radio - - - - 1 - 2 - GTK_FILL - - - - - True - True - No Default Notebook - 0 - 0 - 0 - True - True - - - - GTK_FILL - - - - - True - 2 - 2 - 5 - 5 - - - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-open - 2 - - - False - False - - - - - True - 5 - Browse... - True - - - False - False - 1 - - - - - - - - - 1 - 2 - - - - - - True - True - - - - - True - True - True - Use current notebook - 0 - - - - 1 - 2 - GTK_FILL - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - Open Last Notebook - 0 - 0 - 0 - True - True - no_default_notebook_radio - - - - 2 - 3 - GTK_FILL - - - - - True - - - 1 - 2 - 2 - 3 - - - - - True - - - 1 - 2 - - - - - - - - - True - <b>Startup</b> - True - - - label_item - - - - - False - - - - - True - 5 - - - True - True - Autosave: - 1 - 0 - True - - - - False - - - - - True - True - 5 - - - False - False - 1 - - - - - True - 0 - seconds - - - 2 - - - - - False - 1 - - - - - True - True - Use system tray icon - 0 - 0 - True - This option may have no effect depending on combination of OS and desktop environment (window manager, panel, system tray, etc.). - - - - False - False - 2 - - - - - True - 20 - - - True - True - Hide from taskbar - 0 - 0 - True - This option may have no effect depending on combination of OS and desktop environment (window manager, panel, system tray, etc.). - - - - - False - False - 3 - - - - - True - 20 - - - True - True - Minimize on start - 0 - 0 - True - This option may have no effect depending on combination of OS and desktop environment (window manager, panel, system tray, etc.). - - - - - False - False - 4 - - - - - True - True - Always on top - 0 - 0 - True - This option may have no effect depending on combination of OS and desktop environment (window manager, panel, system tray, etc.). - - - False - False - 5 - - - - - True - True - Visible on all desktops - 0 - 0 - True - This option may have no effect depending on combination of OS and desktop environment (window manager, panel, system tray, etc.). - - - False - False - 6 - - - - - True - True - Use fulltext indexing - 0 - 0 - True - You need to disbale this option if fulltext indexing doesn't work for your language. - - - False - False - 7 - - - - - True - - - False - False - 8 - - - + False + Extensions Options + - - - - - True - <b>General KeepNote Options</b> - True - - - label_item - + - + - - + + + + + False + False + Please Wait + dialog + main_window - + True - 0 - GTK_SHADOW_NONE + False + vertical + 6 - + True - 10 - 10 - - - True - GTK_ORIENTATION_VERTICAL - 5 - GTK_ORIENTATION_VERTICAL - - - True - 0 - From here, you can customize the format of timestamps in the listview for 4 different scenarios (e.g. how to display a timestamp from today, this month, or this year) - True - - - False - False - - - - - True - 5 - 5 - 10 - - - True - 4 - 2 - 5 - 5 - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 1 - Different year: - GTK_JUSTIFY_RIGHT - - - 3 - 4 - GTK_FILL - - - - - - True - 1 - Same year: - GTK_JUSTIFY_RIGHT - - - 2 - 3 - GTK_FILL - - - - - - True - 1 - Same month: - GTK_JUSTIFY_RIGHT - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - 1 - Same day: - GTK_JUSTIFY_RIGHT - - - GTK_FILL - - - - - - - - False - 1 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - GTK_RESIZE_QUEUE - - - True - 22 - 2 - 10 - 2 - - - True - 0 - A literal "%" character - - - 1 - 2 - 21 - 22 - GTK_FILL - - - - - True - 0 - Time zone name (no characters if no time zone exists) - - - 1 - 2 - 20 - 21 - GTK_FILL - - - - - True - 0 - Year with century as a decimal number - - - 1 - 2 - 19 - 20 - GTK_FILL - - - - - True - 0 - Year without century as a decimal number [00,99] - - - 1 - 2 - 18 - 19 - GTK_FILL - - - - - True - 0 - Locale's appropriate time representation - - - 1 - 2 - 17 - 18 - GTK_FILL - - - - - True - 0 - Locale's appropriate date representation - - - 1 - 2 - 16 - 17 - GTK_FILL - - - - - True - 0 - Week number of the year (Monday as the first day of the week) -as a decimal number [00,53]. All days in a new year preceding -the first Monday are considered to be in week 0 - - - 1 - 2 - 15 - 16 - GTK_FILL - - - - - True - 0 - Weekday as a decimal number [0(Sunday),6] - - - 1 - 2 - 14 - 15 - GTK_FILL - - - - - True - 0 - Week number of the year (Sunday as the first day of the week) -as a decimal number [00,53]. All days in a new year preceding -the first Sunday are considered to be in week 0 - - - 1 - 2 - 13 - 14 - GTK_FILL - - - - - True - 0 - Second as a decimal number [00,61] - - - 1 - 2 - 12 - 13 - GTK_FILL - - - - - True - 0 - Locale's equivalent of either AM or PM - - - 1 - 2 - 11 - 12 - GTK_FILL - - - - - True - 0 - Minute as a decimal number [00,59] - - - 1 - 2 - 10 - 11 - GTK_FILL - - - - - True - 0 - Month as a decimal number [01,12] - - - 1 - 2 - 9 - 10 - GTK_FILL - - - - - True - 0 - Day of the year as a decimal number [001,366] - - - 1 - 2 - 8 - 9 - GTK_FILL - - - - - True - 0 - %% - - - 21 - 22 - GTK_FILL - - - - - True - 0 - %Z - - - 20 - 21 - GTK_FILL - - - - - True - 0 - %Y - - - 19 - 20 - GTK_FILL - - - - - True - 0 - %y - - - 18 - 19 - GTK_FILL - - - - - True - 0 - %X - - - 17 - 18 - GTK_FILL - - - - - True - 0 - %x - - - 16 - 17 - GTK_FILL - - - - - True - 0 - 0 - %W - - - 15 - 16 - GTK_FILL - - - - - True - 0 - %w - - - 14 - 15 - GTK_FILL - - - - - True - 0 - 0 - %U - - - 13 - 14 - GTK_FILL - - - - - True - 0 - %S - - - 12 - 13 - GTK_FILL - - - - - True - 0 - %p - - - 11 - 12 - GTK_FILL - - - - - True - 0 - %M - - - 10 - 11 - GTK_FILL - - - - - True - 0 - %m - - - 9 - 10 - GTK_FILL - - - - - True - 0 - %j - - - 8 - 9 - GTK_FILL - - - - - True - 0 - Hour (12-hour clock) as a decimal number [01,12] - - - 1 - 2 - 7 - 8 - GTK_FILL - - - - - True - 0 - Hour (24-hour clock) as a decimal number [00,23] - - - 1 - 2 - 6 - 7 - GTK_FILL - - - - - True - 0 - Day of the month as a decimal number [01,31] - - - 1 - 2 - 5 - 6 - GTK_FILL - - - - - True - 0 - %I - - - 7 - 8 - GTK_FILL - - - - - True - 0 - %H - - - 6 - 7 - GTK_FILL - - - - - True - 0 - %d - - - 5 - 6 - GTK_FILL - - - - - True - 0 - Locale's appropriate date and time representation - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - 0 - %c - - - 4 - 5 - GTK_FILL - - - - - True - 0 - Locale's full month name - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - True - 0 - Locale's abbreviated month name - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - 0 - Locale's full weekday name - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - 0 - Locale's abbreviated weekday name - - - 1 - 2 - GTK_FILL - - - - - True - 0 - %B - - - 3 - 4 - GTK_FILL - - - - - True - 0 - %b - - - 2 - 3 - GTK_FILL - - - - - True - 0 - %A - - - 1 - 2 - GTK_FILL - - - - - True - 0 - %a - - - GTK_FILL - - - - - - - - - - - True - <b>Date &amp; time formatting key</b> - True - - - label_item - - - - - 2 - - - - - + False + Loading... + center + + + False + True + 0 + - + True - <b>Date and Time</b> - True - + False + True + - label_item + True + True + 1 - - - - - - - True - 0 - GTK_SHADOW_NONE - + True - 10 - 10 + True + True + end - + True - GTK_ORIENTATION_VERTICAL - GTK_ORIENTATION_VERTICAL + False + horizontal + 4 - + True - 2 - 2 - 5 - - - True - - - True - True - • - - - - - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-open - 2 - - - False - False - - - - - True - 5 - Browse... - True - - - False - False - 1 - - - - - - - - - 1 - - - - - True - - - 2 - - - - - 1 - 2 - 1 - 2 - - - - - - True - 5 - - - True - - - - - - False - - - - - True - True - 1 1 100 1 10 10 - - - False - 1 - - - - - True - - - 2 - - - - - 1 - 2 - - - - - - True - Default font: - GTK_JUSTIFY_RIGHT - - - - - - - - True - Alternative index location: - GTK_JUSTIFY_RIGHT - - - 1 - 2 - - - - + False + gtk-cancel + - + + + True + False + Cancel + + + - - - - - True - <b>This Notebook</b> - True - + - label_item + False + False + 2 - + - - + + \ No newline at end of file diff --git a/keepnote/rc/keepnote.glade.h b/keepnote/rc/keepnote.glade.h deleted file mode 100644 index d87706367..000000000 --- a/keepnote/rc/keepnote.glade.h +++ /dev/null @@ -1,112 +0,0 @@ -char *s = N_("%%"); -char *s = N_("%A"); -char *s = N_("%B"); -char *s = N_("%H"); -char *s = N_("%I"); -char *s = N_("%M"); -char *s = N_("%S"); -char *s = N_("%U"); -char *s = N_("%W"); -char *s = N_("%X"); -char *s = N_("%Y"); -char *s = N_("%Z"); -char *s = N_("%a"); -char *s = N_("%b"); -char *s = N_("%c"); -char *s = N_("%d"); -char *s = N_("%j"); -char *s = N_("%m"); -char *s = N_("%p"); -char *s = N_("%w"); -char *s = N_("%x"); -char *s = N_("%y"); -char *s = N_("50"); -char *s = N_("All Available icons"); -char *s = N_("Date & time formatting key"); -char *s = N_("Date and Time"); -char *s = N_("General KeepNote Options"); -char *s = N_("Manage icons"); -char *s = N_("Node icons"); -char *s = N_("Notebook Update"); -char *s = N_("Quick pick icons"); -char *s = N_("Startup"); -char *s = N_("This Notebook"); -char *s = N_("note: backup and upgrade may take a while for larger notebooks."); -char *s = N_("A literal \"%\" character"); -char *s = N_("Alternative index location:"); -char *s = N_("Always on top"); -char *s = N_("Autosave:"); -char *s = N_("Browse..."); -char *s = N_("Case _Sensitive"); -char *s = N_("Day of the month as a decimal number [01,31]"); -char *s = N_("Day of the year as a decimal number [001,366]"); -char *s = N_("Default Notebook:"); -char *s = N_("Default font:"); -char *s = N_("Different year:"); -char *s = N_("Find Text:"); -char *s = N_("Find/Replace"); -char *s = N_("From here, you can customize the format of timestamps in the listview for 4 different scenarios (e.g. how to display a timestamp from today, this month, or this year)"); -char *s = N_("Hide from taskbar"); -char *s = N_("Hour (12-hour clock) as a decimal number [01,12]"); -char *s = N_("Hour (24-hour clock) as a decimal number [00,23]"); -char *s = N_("Keep aspect ratio"); -char *s = N_("KeepNote Preferences"); -char *s = N_("Locale's abbreviated month name"); -char *s = N_("Locale's abbreviated weekday name"); -char *s = N_("Locale's appropriate date and time representation"); -char *s = N_("Locale's appropriate date representation"); -char *s = N_("Locale's appropriate time representation"); -char *s = N_("Locale's equivalent of either AM or PM"); -char *s = N_("Locale's full month name"); -char *s = N_("Locale's full weekday name"); -char *s = N_("Minimize on start"); -char *s = N_("Minute as a decimal number [00,59]"); -char *s = N_("Month as a decimal number [01,12]"); -char *s = N_("New Icon"); -char *s = N_("No Default Notebook"); -char *s = N_("Notebook Update"); -char *s = N_("Notebook-specific Icons"); -char *s = N_("Open Last Notebook"); -char *s = N_("Replace Text:"); -char *s = N_("Replace _All"); -char *s = N_("Resize Image"); -char *s = N_("Same day:"); -char *s = N_("Same month:"); -char *s = N_("Same year:"); -char *s = N_("Sea_rch Forward"); -char *s = N_("Search _Backward "); -char *s = N_("Second as a decimal number [00,61]"); -char *s = N_("Snap:"); -char *s = N_("Standard Icons"); -char *s = N_("This notebook has format version 1 and must be updated to version 2 before openning."); -char *s = N_("Time zone name (no characters if no time zone exists)"); -char *s = N_("Use current notebook"); -char *s = N_("Use system tray icon"); -char *s = N_("Visible on all desktops"); -char *s = N_("Week number of the year (Monday as the first day of the week) \n" - "as a decimal number [00,53]. All days in a new year preceding \n" - "the first Monday are considered to be in week 0"); -char *s = N_("Week number of the year (Sunday as the first day of the week) \n" - "as a decimal number [00,53]. All days in a new year preceding \n" - "the first Sunday are considered to be in week 0"); -char *s = N_("Weekday as a decimal number [0(Sunday),6]"); -char *s = N_("Year with century as a decimal number"); -char *s = N_("Year without century as a decimal number [00,99]"); -char *s = N_("_Apply"); -char *s = N_("_Cancel"); -char *s = N_("_Close"); -char *s = N_("_Find"); -char *s = N_("_Ok"); -char *s = N_("_Replace"); -char *s = N_("delete icon"); -char *s = N_("gtk-cancel"); -char *s = N_("gtk-ok"); -char *s = N_("gtk-revert-to-saved"); -char *s = N_("height:"); -char *s = N_("icon:"); -char *s = N_("open-icon:"); -char *s = N_("save backup before updating (recommended)"); -char *s = N_("seconds"); -char *s = N_("set icon"); -char *s = N_("set open-icon"); -char *s = N_("width:"); diff --git a/keepnote/rc/keepnote.ui b/keepnote/rc/keepnote.ui new file mode 100644 index 000000000..ed0f8ff83 --- /dev/null +++ b/keepnote/rc/keepnote.ui @@ -0,0 +1,870 @@ + + + + + + + + False + False + KeepNote + 800 + 600 + + + True + False + vertical + + + + True + False + + + True + False + _File + True + + + True + False + + + True + False + New Notebook + True + + + + + True + False + Open Notebook... + True + + + + + True + False + Save + True + + + + + True + False + Close + True + + + + + True + False + + + + + True + False + Quit + True + + + + + + + + + True + False + _Edit + True + + + True + False + + + True + False + Undo + True + + + + + True + False + Redo + True + + + + + + + + + + False + False + 0 + + + + + True + False + Main1 Window Content + + + True + True + 1 + + + + + + + + + False + False + KeepNote Options + dialog + main_window + + + True + False + vertical + 6 + + + True + True + True + True + + + True + True + 0 + + + + + True + True + True + True + + + True + True + 1 + + + + + True + False + horizontal + 6 + end + + + True + True + True + + + True + False + horizontal + 4 + + + True + False + gtk-ok + + + + + True + False + OK + + + + + + + False + False + 0 + + + + + True + True + True + + + True + False + horizontal + 4 + + + True + False + gtk-cancel + + + + + True + False + Cancel + + + + + + + False + False + 1 + + + + + True + True + True + + + True + False + horizontal + 4 + + + True + False + gtk-apply + + + + + True + False + Apply + + + + + + + False + False + 2 + + + + + False + False + 2 + + + + + + + + + True + False + General + 0 + none + + + True + False + 10 + 10 + 10 + + + True + False + vertical + 6 + + + True + True + Use last notebook + True + default_notebook_radio + + + False + False + 0 + + + + + True + True + No default notebook + True + default_notebook_radio + + + False + False + 1 + + + + + True + True + Default notebook: + True + + + False + False + 2 + + + + + True + False + 1 + 2 + + + True + True + True + + + 0 + 0 + + + + + True + True + + + True + False + horizontal + 4 + + + True + False + gtk-open + + + + + True + False + Browse + + + + + + + 1 + 0 + + + + + False + False + 10 + 3 + + + + + True + True + Autosave every: + True + + + False + False + 4 + + + + + True + False + horizontal + 6 + + + True + True + 5 + + + False + False + 0 + + + + + True + False + seconds + + + False + False + 1 + + + + + False + False + 10 + 5 + + + + + True + True + Use system tray + True + + + False + False + 6 + + + + + True + False + vertical + 6 + + + True + True + Skip taskbar + True + + + False + False + 0 + + + + + True + True + Minimize on start + True + + + False + False + 1 + + + + + False + False + 10 + 7 + + + + + True + True + Keep above other windows + True + + + False + False + 8 + + + + + True + True + Stick to all workspaces + True + + + False + False + 9 + + + + + True + True + Use fulltext search + True + + + False + False + 10 + + + + + + + + + + + True + False + Look and Feel + 0 + none + + + True + False + 10 + 10 + 10 + + + True + False + vertical + 6 + + + True + False + Look and Feel Options + + + + + + + + + + + True + False + Language + 0 + none + + + True + False + 10 + 10 + 10 + + + True + False + vertical + 6 + + + True + False + Language Options + + + + + + + + + + + True + False + Date and Time + 0 + none + + + True + False + 10 + 10 + 10 + + + True + False + vertical + 6 + + + True + False + Date and Time Options + + + + + + + + + + + True + False + Editor + 0 + none + + + True + False + 10 + 10 + 10 + + + True + False + vertical + 6 + + + True + False + Editor Options + + + + + + + + + + + True + False + Helper Applications + 0 + none + + + True + False + 10 + 10 + 10 + + + True + False + vertical + 6 + + + True + False + Helper Applications Options + + + + + + + + + + + True + False + Notebook Options + 0 + none + + + True + False + 10 + 10 + 10 + + + True + False + vertical + 6 + + + True + False + Notebook Options + + + + + + + + + + + True + False + Extensions + 0 + none + + + True + False + 10 + 10 + 10 + + + True + False + vertical + 6 + + + True + False + Extensions Options + + + + + + + + + + + False + False + Please Wait + dialog + main_window + + + True + False + vertical + 6 + + + True + False + Loading... + center + + + False + True + 0 + + + + + True + False + True + + + True + True + 1 + + + + + True + True + True + end + + + True + False + horizontal + 4 + + + True + False + gtk-cancel + + + + + True + False + Cancel + + + + + + + False + False + 2 + + + + + + \ No newline at end of file diff --git a/keepnote/rc/keepnote.ui.bak b/keepnote/rc/keepnote.ui.bak new file mode 100644 index 000000000..de220c280 --- /dev/null +++ b/keepnote/rc/keepnote.ui.bak @@ -0,0 +1,536 @@ + + + + + + + + + True + KeepNote + 800 + 600 + + + True + + + True + Menu + + + + + + + + + True + horizontal + + + True + True + True + + + + + Title + + + + 0 + + + + + + + + + True + True + True + vertical + + + True + Main Window Content + + + + + + + + + + False + KeepNote Options + main_window + + + True + vertical + 6 + + + True + True + True + True + + + + + Config + + + + 0 + + + + + + + + + True + True + True + True + + + + + True + horizontal + 6 + end + + + True + True + True + + + True + horizontal + 4 + + + True + gtk-ok + + + + + True + OK + + + + + + + + + True + True + True + + + True + horizontal + 4 + + + True + gtk-cancel + + + + + True + Cancel + + + + + + + + + True + True + True + + + True + horizontal + 4 + + + True + gtk-apply + + + + + True + Apply + + + + + + + + + + + + + + True + General + 0 + + + True + vertical + 6 + 10 + 10 + 10 + + + True + True + Use as default notebook + False + + + + + True + 6 + + + True + True + True + + + 0 + 0 + + + + + True + True + + + True + horizontal + 4 + + + True + gtk-open + + + + + True + Browse + + + + + + + 1 + 0 + + + + + + + True + True + Autosave every: + + + + + True + horizontal + 6 + + + True + True + 5 + + + + + True + seconds + + + + + + + True + True + Use system tray + + + + + True + vertical + 6 + + + True + True + Skip taskbar + + + + + True + True + Minimize on start + + + + + + + + + True + True + Use fulltext search + + + + + + + + True + Look and Feel + 0 + + + True + vertical + 6 + 10 + 10 + 10 + + + True + Look and Feel Options + + + + + + + + True + Language + 0 + + + True + vertical + 6 + 10 + 10 + 10 + + + True + Language Options + + + + + + + + True + Date and Time + 0 + + + True + vertical + 6 + 10 + 10 + 10 + + + True + Date and Time Options + + + + + + + + True + Editor + 0 + + + True + vertical + 6 + 10 + 10 + 10 + + + True + Editor Options + + + + + + + + True + Helper Applications + 0 + + + True + vertical + 6 + 10 + 10 + 10 + + + True + Helper Applications Options + + + + + + + + True + Notebook Options + 0 + + + True + vertical + 6 + 10 + 10 + 10 + + + True + Notebook Options + + + + + + + + True + Extensions + 0 + + + True + vertical + 6 + 10 + 10 + 10 + + + True + Extensions Options + + + + + + + + False + Please Wait + main_window + + + True + vertical + 6 + + + True + Loading... + center + + + + + True + True + + + + + True + True + True + end + + + True + horizontal + 4 + + + True + gtk-cancel + + + + + True + Cancel + + + + + + + + + + \ No newline at end of file diff --git a/keepnote/rc/menu.ui b/keepnote/rc/menu.ui new file mode 100644 index 000000000..fba2a03ea --- /dev/null +++ b/keepnote/rc/menu.ui @@ -0,0 +1,30 @@ + + + + +
+ + _New Note + app.new_note + + + _Open Notebook + app.open_notebook + + + _Save + app.save + +
+
+ + _Preferences + app.preferences + + + _Quit + app.quit + +
+ + \ No newline at end of file diff --git a/keepnote/safefile.py b/keepnote/safefile.py index f61696e6b..753771a8e 100644 --- a/keepnote/safefile.py +++ b/keepnote/safefile.py @@ -1,41 +1,13 @@ """ - - KeepNote - Safely write to a tempfile before replacing previous file. - +KeepNote +Safely write to a tempfile before replacing previous file. """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - import codecs import os import sys import tempfile - - -# NOTE: bypass easy_install's monkey patching of file -# easy_install does not correctly emulate 'file' -if type(file) != type: - # HACK: this works as long as sys.stdout is not patched - file = type(sys.stdout) - +import builtins def open(filename, mode="r", tmp=None, codec=None): """ @@ -43,70 +15,78 @@ def open(filename, mode="r", tmp=None, codec=None): on close. filename -- filename to open - mode -- write mode (default: 'w') - tmp -- specify tempfile - codec -- preferred encoding + mode -- file mode (e.g., 'r', 'w', 'rb', 'wb') + tmp -- specify tempfile (optional) + codec -- preferred encoding (ignored in binary mode) """ - stream = SafeFile(filename, mode, tmp) - - if "b" not in mode and codec: - if "r" in mode: - stream = codecs.getreader(codec)(stream) - elif "w" in mode: - stream = codecs.getwriter(codec)(stream) - + stream = SafeFile(filename, mode, tmp, codec=codec) return stream - -class SafeFile (file): - - def __init__(self, filename, mode="r", tmp=None): - """ - filename -- filename to open - mode -- write mode (default: 'w') - tmp -- specify tempfile - """ - - # set tempfile +class SafeFile: + def __init__(self, filename, mode="r", tmp=None, codec=None): + # Set tempfile for writing if "w" in mode and tmp is None: - f, tmp = tempfile.mkstemp(".tmp", filename+"_", dir=".") + f, tmp = tempfile.mkstemp(".tmp", os.path.basename(filename) + "_", + dir=os.path.dirname(filename) or ".") os.close(f) self._tmp = tmp self._filename = filename - - # open file - if self._tmp: - file.__init__(self, self._tmp, mode) + self._mode = mode + self._codec = codec + + # Check if binary mode + is_binary = "b" in mode + + # Open file with appropriate parameters + if is_binary: + self.file = builtins.open( + self._tmp if self._tmp else filename, + mode, + buffering=0 # No buffering for binary mode + ) + else: + self.file = builtins.open( + self._tmp if self._tmp else filename, + mode, + buffering=1, # Line buffering for text mode + encoding=codec if codec else "utf-8" + ) + + def write(self, data): + """Write data to the file""" + if "b" in self._mode: + if not isinstance(data, bytes): + raise TypeError("SafeFile.write() expects bytes in binary mode") else: - file.__init__(self, filename, mode) + if not isinstance(data, str): + raise TypeError("SafeFile.write() expects str in text mode") + self.file.write(data) + + def read(self, size=-1): + """Read data from the file""" + return self.file.read(size) def close(self): """Closes file and moves temp file to final location""" try: - self.flush() - os.fsync(self.fileno()) - except: + self.file.flush() + if hasattr(self.file, 'fileno'): + os.fsync(self.file.fileno()) + except Exception: pass - file.close(self) - if self._tmp: - # NOTE: windows will not allow rename when destination file exists - if sys.platform.startswith("win"): - if os.path.exists(self._filename): - os.remove(self._filename) + self.file.close() + + if self._tmp and "w" in self._mode: + if sys.platform.startswith("win") and os.path.exists(self._filename): + os.remove(self._filename) os.rename(self._tmp, self._filename) self._tmp = None def discard(self): - """ - Close and discard written data. - - Temp file does not replace existing file - """ - - file.close(self) - + """Close and discard written data""" + self.file.close() if self._tmp: os.remove(self._tmp) self._tmp = None @@ -114,3 +94,9 @@ def discard(self): def get_tempfile(self): """Returns tempfile filename""" return self._tmp + + def __enter__(self): + return self + + def __exit__(self, exc_type, exc_value, traceback): + self.close() \ No newline at end of file diff --git a/keepnote/server/__init__.py b/keepnote/server/__init__.py index 8a12d1495..1d6a95cb8 100644 --- a/keepnote/server/__init__.py +++ b/keepnote/server/__init__.py @@ -6,34 +6,15 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports -from cStringIO import StringIO -from httplib import BAD_REQUEST -from httplib import FORBIDDEN -from httplib import NOT_FOUND +from io import StringIO +from http.client import BAD_REQUEST +from http.client import FORBIDDEN +from http.client import NOT_FOUND import json import mimetypes import os -import urllib +import urllib.request, urllib.parse, urllib.error # bottle imports from . import bottle @@ -44,7 +25,7 @@ from .bottle import static_file from .bottle import template -# keepnote imports +# keepnote.py imports import keepnote from keepnote.notebook import new_nodeid import keepnote.notebook.connection as connlib @@ -65,9 +46,9 @@ def format_node_path(prefix, nodeid="", filename=None): """ nodeid = nodeid.replace("/", "%2F") if filename is not None: - return urllib.quote("%s%s/%s" % (prefix, nodeid, filename)) + return urllib.parse.quote("%s%s/%s" % (prefix, nodeid, filename)) else: - return urllib.quote(prefix + nodeid) + return urllib.parse.quote(prefix + nodeid) def format_node_url(host, prefix, nodeid, filename=None, port=80): @@ -228,7 +209,7 @@ def read_node_view(self, nodeid): """ Read notebook node attr. """ - nodeid = urllib.unquote(nodeid) + nodeid = urllib.parse.unquote(nodeid) if 'all' in request.query: # Render a simple tree @@ -243,7 +224,7 @@ def read_node_view(self, nodeid): return self.json_response(attr) - except connlib.UnknownNode, e: + except connlib.UnknownNode as e: keepnote.log_error() abort(NOT_FOUND, 'node not found ' + str(e)) @@ -252,7 +233,7 @@ def create_node_view(self, nodeid=None): Create new notebook node. """ if nodeid is not None: - nodeid = urllib.unquote(nodeid) + nodeid = urllib.parse.unquote(nodeid) else: nodeid = new_nodeid() @@ -261,7 +242,7 @@ def create_node_view(self, nodeid=None): try: self.conn.create_node(nodeid, attr) - except connlib.NodeExists, e: + except connlib.NodeExists as e: keepnote.log_error() abort(FORBIDDEN, 'node already exists.' + str(e)) @@ -269,7 +250,7 @@ def create_node_view(self, nodeid=None): def update_node_view(self, nodeid): """Update notebook node attr.""" - nodeid = urllib.unquote(nodeid) + nodeid = urllib.parse.unquote(nodeid) # update node data = request.body.read() @@ -277,7 +258,7 @@ def update_node_view(self, nodeid): try: self.conn.update_node(nodeid, attr) - except connlib.UnknownNode, e: + except connlib.UnknownNode as e: keepnote.log_error() abort(NOT_FOUND, 'node not found ' + str(e)) @@ -285,10 +266,10 @@ def update_node_view(self, nodeid): def delete_node_view(self, nodeid): """Delete notebook node.""" - nodeid = urllib.unquote(nodeid) + nodeid = urllib.parse.unquote(nodeid) try: self.conn.delete_node(nodeid) - except connlib.UnknownNode, e: + except connlib.UnknownNode as e: keepnote.log_error() abort(NOT_FOUND, 'node not found ' + str(e)) @@ -296,14 +277,14 @@ def has_node_view(self, nodeid): """ Check for node existence. """ - nodeid = urllib.unquote(nodeid) + nodeid = urllib.parse.unquote(nodeid) if not self.conn.has_node(nodeid): abort(NOT_FOUND, 'node not found') def read_file_view(self, nodeid, filename): """Access notebook file.""" - nodeid = urllib.unquote(nodeid) - filename = urllib.unquote(filename) + nodeid = urllib.parse.unquote(nodeid) + filename = urllib.parse.unquote(filename) if not filename: filename = '/' @@ -328,10 +309,10 @@ def read_file_view(self, nodeid, filename): # TODO: return stream. return stream.read() - except connlib.UnknownNode, e: + except connlib.UnknownNode as e: keepnote.log_error() abort(NOT_FOUND, 'cannot find node ' + str(e)) - except connlib.FileError, e: + except connlib.FileError as e: keepnote.log_error() abort(FORBIDDEN, 'Could not read file ' + str(e)) @@ -339,8 +320,8 @@ def write_file_view(self, nodeid, filename): """ Write node file. """ - nodeid = urllib.unquote(nodeid) - filename = urllib.unquote(filename) + nodeid = urllib.parse.unquote(nodeid) + filename = urllib.parse.unquote(filename) if not filename: filename = '/' @@ -363,10 +344,10 @@ def write_file_view(self, nodeid, filename): stream.write(request.body.read()) stream.close() - except connlib.UnknownNode, e: + except connlib.UnknownNode as e: keepnote.log_error() abort(NOT_FOUND, 'cannot find node ' + str(e)) - except connlib.FileError, e: + except connlib.FileError as e: keepnote.log_error() abort(FORBIDDEN, 'Could not write file ' + str(e)) @@ -374,18 +355,18 @@ def delete_file_view(self, nodeid, filename): """ Delete node file. """ - nodeid = urllib.unquote(nodeid) - filename = urllib.unquote(filename) + nodeid = urllib.parse.unquote(nodeid) + filename = urllib.parse.unquote(filename) if not filename: filename = '/' try: # delete file/dir self.conn.delete_file(nodeid, filename) - except connlib.UnknownNode, e: + except connlib.UnknownNode as e: keepnote.log_error() abort(NOT_FOUND, 'cannot find node ' + str(e)) - except connlib.FileError, e: + except connlib.FileError as e: keepnote.log_error() abort(FORBIDDEN, 'cannot delete file ' + str(e)) @@ -393,8 +374,8 @@ def has_file_view(self, nodeid, filename): """ Check node file existence. """ - nodeid = urllib.unquote(nodeid) - filename = urllib.unquote(filename) + nodeid = urllib.parse.unquote(nodeid) + filename = urllib.parse.unquote(filename) if not filename: filename = '/' @@ -413,7 +394,7 @@ def create_node_view(self, nodeid=None): Create new notebook node. """ if nodeid is not None: - nodeid = urllib.unquote(nodeid) + nodeid = urllib.parse.unquote(nodeid) else: nodeid = new_nodeid() @@ -425,7 +406,7 @@ def create_node_view(self, nodeid=None): try: self.conn.create_node(nodeid, attr) - except connlib.NodeExists, e: + except connlib.NodeExists as e: keepnote.log_error() abort(FORBIDDEN, 'node already exists.' + str(e)) diff --git a/keepnote/server/bottle.py b/keepnote/server/bottle.py index 4cac0a5d3..559dbe63d 100644 --- a/keepnote/server/bottle.py +++ b/keepnote/server/bottle.py @@ -1,19 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -""" -Bottle is a fast and simple micro-framework for small web applications. It -offers request dispatching (Routes) with url parameter support, templates, -a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and -template engines - all in a single file and with no dependencies other than the -Python Standard Library. -Homepage and documentation: http://bottlepy.org/ - -Copyright (c) 2014, Marcel Hellkamp. -License: MIT (see LICENSE for details) -""" - -from __future__ import with_statement +from waitress import serve +from optparse import OptionParser +from paste import httpserver +from paste.translogger import TransLogger __author__ = 'Marcel Hellkamp' __version__ = '0.13-dev' @@ -23,7 +14,7 @@ # they are imported. This is why we parse the commandline parameters here but # handle them later if __name__ == '__main__': - from optparse import OptionParser + _cmd_parser = OptionParser(usage="usage: %prog [options] package.module:app") _opt = _cmd_parser.add_option _opt("--version", action="store_true", help="show version number.") @@ -39,13 +30,13 @@ elif _cmd_options.server.startswith('eventlet'): import eventlet; eventlet.monkey_patch() -import base64, cgi, email.utils, functools, hmac, imp, itertools, mimetypes,\ +import base64, cgi, email.utils, functools, hmac, itertools, mimetypes,\ os, re, subprocess, sys, tempfile, threading, time, warnings from datetime import date as datedate, datetime, timedelta from tempfile import TemporaryFile from traceback import format_exc, print_exc -from inspect import getargspec +from inspect import getfullargspec as getargspec from unicodedata import normalize @@ -88,49 +79,49 @@ def _e(): return sys.exc_info()[1] from urllib.parse import urlencode, quote as urlquote, unquote as urlunquote urlunquote = functools.partial(urlunquote, encoding='latin1') from http.cookies import SimpleCookie - from collections import MutableMapping as DictMixin + from collections.abc import MutableMapping as DictMixin import pickle from io import BytesIO from configparser import ConfigParser - basestring = str - unicode = str + str = str + str = str json_loads = lambda s: json_lds(touni(s)) callable = lambda x: hasattr(x, '__call__') imap = map def _raise(*a): raise a[0](a[1]).with_traceback(a[2]) else: # 2.x - import httplib - import thread - from urlparse import urljoin, SplitResult as UrlSplitResult - from urllib import urlencode, quote as urlquote, unquote as urlunquote - from Cookie import SimpleCookie - from itertools import imap - import cPickle as pickle - from StringIO import StringIO as BytesIO - from ConfigParser import SafeConfigParser as ConfigParser + import http.client + import _thread + from urllib.parse import urljoin, SplitResult as UrlSplitResult + from urllib.parse import urlencode, quote as urlquote, unquote as urlunquote + from http.cookies import SimpleCookie + + import pickle as pickle + from io import StringIO as BytesIO + from configparser import SafeConfigParser as ConfigParser if py25: msg = "Python 2.5 support may be dropped in future versions of Bottle." warnings.warn(msg, DeprecationWarning) from UserDict import DictMixin - def next(it): return it.next() + def next(it): return next(it) bytes = str else: # 2.6, 2.7 from collections import MutableMapping as DictMixin - unicode = unicode + str = str json_loads = json_lds eval(compile('def _raise(*a): raise a[0], a[1], a[2]', '', 'exec')) # Some helpers for string/byte handling def tob(s, enc='utf8'): - return s.encode(enc) if isinstance(s, unicode) else bytes(s) + return s.encode(enc) if isinstance(s, str) else bytes(s) def touni(s, enc='utf8', err='strict'): if isinstance(s, bytes): return s.decode(enc, err) else: - return unicode(s or ("" if s is None else s)) + return str(s or ("" if s is None else s)) tonat = touni if py3k else tob @@ -800,7 +791,7 @@ def hello(name): plugins = makelist(apply) skiplist = makelist(skip) def decorator(callback): - if isinstance(callback, basestring): callback = load(callback) + if isinstance(callback, str): callback = load(callback) for rule in makelist(path) or yieldroutes(callback): for verb in makelist(method): verb = verb.upper() @@ -888,10 +879,10 @@ def _cast(self, out, peek=None): return [] # Join lists of byte or unicode strings. Mixed lists are NOT supported if isinstance(out, (tuple, list))\ - and isinstance(out[0], (bytes, unicode)): + and isinstance(out[0], (bytes, str)): out = out[0][0:0].join(out) # b'abc'[0:0] -> b'' # Encode unicode strings - if isinstance(out, unicode): + if isinstance(out, str): out = out.encode(response.charset) # Byte Strings are just returned if isinstance(out, bytes): @@ -936,9 +927,9 @@ def _cast(self, out, peek=None): return self._cast(first) elif isinstance(first, bytes): new_iter = itertools.chain([first], iout) - elif isinstance(first, unicode): + elif isinstance(first, str): encoder = lambda x: x.encode(response.charset) - new_iter = imap(encoder, itertools.chain([first], iout)) + new_iter = map(encoder, itertools.chain([first], iout)) else: msg = 'Unsupported response type: %s' % type(first) return self._cast(HTTPError(500, msg)) @@ -1053,7 +1044,7 @@ def get_header(self, name, default=None): def cookies(self): """ Cookies parsed into a :class:`FormsDict`. Signed cookies are NOT decoded. Use :meth:`get_cookie` if you expect signed cookies. """ - cookies = SimpleCookie(self.environ.get('HTTP_COOKIE','')).values() + cookies = list(SimpleCookie(self.environ.get('HTTP_COOKIE','')).values()) return FormsDict((c.key, c.value) for c in cookies) def get_cookie(self, key, default=None, secret=None): @@ -1368,7 +1359,7 @@ def __getitem__(self, key): return self.environ[key] def __delitem__(self, key): self[key] = ""; del(self.environ[key]) def __iter__(self): return iter(self.environ) def __len__(self): return len(self.environ) - def keys(self): return self.environ.keys() + def keys(self): return list(self.environ.keys()) def __setitem__(self, key, value): """ Change an environ value and clear all caches that depend on it. """ @@ -1462,11 +1453,11 @@ def __init__(self, body='', status=None, headers=None, **more_headers): self.status = status or self.default_status if headers: if isinstance(headers, dict): - headers = headers.items() + headers = list(headers.items()) for name, value in headers: self.add_header(name, value) if more_headers: - for name, value in more_headers.items(): + for name, value in list(more_headers.items()): self.add_header(name, value) def copy(self, cls=None): @@ -1475,7 +1466,7 @@ def copy(self, cls=None): assert issubclass(cls, BaseResponse) copy = cls() copy.status = self.status - copy._headers = dict((k, v[:]) for (k, v) in self._headers.items()) + copy._headers = dict((k, v[:]) for (k, v) in list(self._headers.items())) if self._cookies: copy._cookies = SimpleCookie() copy._cookies.load(self._cookies.output()) @@ -1565,7 +1556,7 @@ def headerlist(self): headers = [h for h in headers if h[0] not in bad_headers] out += [(name, val) for name, vals in headers for val in vals] if self._cookies: - for c in self._cookies.values(): + for c in list(self._cookies.values()): out.append(('Set-Cookie', c.OutputString())) return out @@ -1620,13 +1611,13 @@ def set_cookie(self, name, value, secret=None, **options): if secret: value = touni(cookie_encode((name, value), secret)) - elif not isinstance(value, basestring): + elif not isinstance(value, str): raise TypeError('Secret key missing for non-string Cookie.') if len(value) > 4096: raise ValueError('Cookie value to long.') self._cookies[name] = value - for key, value in options.items(): + for key, value in list(options.items()): if key == 'max_age': if isinstance(value, timedelta): value = value.seconds + value.days * 24 * 3600 @@ -1814,7 +1805,7 @@ class MultiDict(DictMixin): """ def __init__(self, *a, **k): - self.dict = dict((k, [v]) for (k, v) in dict(*a, **k).items()) + self.dict = dict((k, [v]) for (k, v) in list(dict(*a, **k).items())) def __len__(self): return len(self.dict) def __iter__(self): return iter(self.dict) @@ -1822,29 +1813,29 @@ def __contains__(self, key): return key in self.dict def __delitem__(self, key): del self.dict[key] def __getitem__(self, key): return self.dict[key][-1] def __setitem__(self, key, value): self.append(key, value) - def keys(self): return self.dict.keys() + def keys(self): return list(self.dict.keys()) if py3k: - def values(self): return (v[-1] for v in self.dict.values()) - def items(self): return ((k, v[-1]) for k, v in self.dict.items()) + def values(self): return (v[-1] for v in list(self.dict.values())) + def items(self): return ((k, v[-1]) for k, v in list(self.dict.items())) def allitems(self): - return ((k, v) for k, vl in self.dict.items() for v in vl) + return ((k, v) for k, vl in list(self.dict.items()) for v in vl) iterkeys = keys itervalues = values iteritems = items iterallitems = allitems else: - def values(self): return [v[-1] for v in self.dict.values()] - def items(self): return [(k, v[-1]) for k, v in self.dict.items()] - def iterkeys(self): return self.dict.iterkeys() - def itervalues(self): return (v[-1] for v in self.dict.itervalues()) + def values(self): return [v[-1] for v in list(self.dict.values())] + def items(self): return [(k, v[-1]) for k, v in list(self.dict.items())] + def iterkeys(self): return iter(self.dict.keys()) + def itervalues(self): return (v[-1] for v in self.dict.values()) def iteritems(self): - return ((k, v[-1]) for k, v in self.dict.iteritems()) + return ((k, v[-1]) for k, v in self.dict.items()) def iterallitems(self): - return ((k, v) for k, vl in self.dict.iteritems() for v in vl) + return ((k, v) for k, vl in self.dict.items() for v in vl) def allitems(self): - return [(k, v) for k, vl in self.dict.iteritems() for v in vl] + return [(k, v) for k, vl in self.dict.items() for v in vl] def get(self, key, default=None, index=-1, type=None): """ Return the most recent value for a key. @@ -1895,7 +1886,7 @@ class FormsDict(MultiDict): recode_unicode = True def _fix(self, s, encoding=None): - if isinstance(s, unicode) and self.recode_unicode: # Python 3 WSGI + if isinstance(s, str) and self.recode_unicode: # Python 3 WSGI return s.encode('latin1').decode(encoding or self.input_encoding) elif isinstance(s, bytes): # Python 2 WSGI return s.decode(encoding or self.input_encoding) @@ -1920,7 +1911,7 @@ def getunicode(self, name, default=None, encoding=None): except (UnicodeError, KeyError): return default - def __getattr__(self, name, default=unicode()): + def __getattr__(self, name, default=str()): # Without this guard, pickle generates a cryptic TypeError: if name.startswith('__') and name.endswith('__'): return super(FormsDict, self).__getattr__(name) @@ -1996,7 +1987,7 @@ def __iter__(self): yield key.replace('_', '-').title() def keys(self): return [x for x in self] - def __len__(self): return len(self.keys()) + def __len__(self): return len(list(self.keys())) def __contains__(self, key): return self._ekey(key) in self.environ @@ -2036,7 +2027,7 @@ def load_dict(self, source, namespace=''): >>> c.load_dict({'some': {'namespace': {'key': 'value'} } }) {'some.namespace.key': 'value'} """ - for key, value in source.items(): + for key, value in list(source.items()): if isinstance(key, str): nskey = (namespace + '.' + key).strip('.') if isinstance(value, dict): @@ -2055,7 +2046,7 @@ def update(self, *a, **ka): if a and isinstance(a[0], str): prefix = a[0].strip('.') + '.' a = a[1:] - for key, value in dict(*a, **ka).items(): + for key, value in list(dict(*a, **ka).items()): self[prefix+key] = value def setdefault(self, key, value): @@ -2088,7 +2079,7 @@ def meta_set(self, key, metafield, value): def meta_list(self, key): """ Return an iterable of meta field names defined for a key. """ - return self._meta.get(key, {}).keys() + return list(self._meta.get(key, {}).keys()) class AppStack(list): @@ -2250,7 +2241,7 @@ def filename(self): or dashes are removed. The filename is limited to 255 characters. """ fname = self.raw_filename - if not isinstance(fname, unicode): + if not isinstance(fname, str): fname = fname.decode('utf8', 'ignore') fname = normalize('NFKD', fname).encode('ASCII', 'ignore').decode('ASCII') fname = os.path.basename(fname.replace('\\', os.path.sep)) @@ -2275,7 +2266,7 @@ def save(self, destination, overwrite=False, chunk_size=2**16): :param overwrite: If True, replace existing files. (default: False) :param chunk_size: Bytes to read at a time. (default: 64kb) """ - if isinstance(destination, basestring): # Except file-likes here + if isinstance(destination, str): # Except file-likes here if os.path.isdir(destination): destination = os.path.join(destination, self.filename) if not overwrite and os.path.exists(destination): @@ -2415,7 +2406,7 @@ def http_date(value): value = value.utctimetuple() elif isinstance(value, (int, float)): value = time.gmtime(value) - if not isinstance(value, basestring): + if not isinstance(value, str): value = time.strftime("%a, %d %b %Y %H:%M:%S GMT", value) return value @@ -2618,7 +2609,7 @@ def run(self, handler): # pragma: no cover pass def __repr__(self): - args = ', '.join(['%s=%s'%(k,repr(v)) for k, v in self.options.items()]) + args = ', '.join(['%s=%s'%(k,repr(v)) for k, v in list(self.options.items())]) return "%s(%s)" % (self.__class__.__name__, args) @@ -2665,26 +2656,23 @@ class server_cls(server_cls): self.port = self.srv.server_port # update port actual port (0 means random) self.srv.serve_forever() - +from cheroot.wsgi import Server as WSGIServer, PathInfoDispatcher class CherryPyServer(ServerAdapter): - def run(self, handler): # pragma: no cover - from cherrypy import wsgiserver - self.options['bind_addr'] = (self.host, self.port) - self.options['wsgi_app'] = handler - + def run(self, handler): # pragma: no cover + bind_addr = (self.host, self.port) + wsgi_app = PathInfoDispatcher({'/': handler}) + certfile = self.options.get('certfile') - if certfile: - del self.options['certfile'] keyfile = self.options.get('keyfile') - if keyfile: - del self.options['keyfile'] - - server = wsgiserver.CherryPyWSGIServer(**self.options) - if certfile: + + server = WSGIServer(bind_addr, wsgi_app) + + # Configure SSL if certfile and keyfile are provided + if certfile and keyfile: + server.ssl_adapter = 'builtin' server.ssl_certificate = certfile - if keyfile: server.ssl_private_key = keyfile - + try: server.start() finally: @@ -2693,31 +2681,28 @@ def run(self, handler): # pragma: no cover class WaitressServer(ServerAdapter): def run(self, handler): - from waitress import serve serve(handler, host=self.host, port=self.port) class PasteServer(ServerAdapter): def run(self, handler): # pragma: no cover - from paste import httpserver - from paste.translogger import TransLogger handler = TransLogger(handler, setup_console_handler=(not self.quiet)) httpserver.serve(handler, host=self.host, port=str(self.port), **self.options) - +from meinheld import server class MeinheldServer(ServerAdapter): def run(self, handler): - from meinheld import server + server.listen((self.host, self.port)) server.run(handler) - +import fapws._evwsgi as evwsgi +from fapws import base, config class FapwsServer(ServerAdapter): """ Extremely fast webserver using libev. See http://www.fapws.org/ """ def run(self, handler): # pragma: no cover - import fapws._evwsgi as evwsgi - from fapws import base, config + port = self.port if float(config.SERVER_IDENT[-2:]) > 0.4: # fapws3 silently changed its API in 0.5 @@ -2995,19 +2980,19 @@ def run(app=None, server='wsgiref', host='127.0.0.1', port=8080, try: if debug is not None: _debug(debug) app = app or default_app() - if isinstance(app, basestring): + if isinstance(app, str): app = load_app(app) if not callable(app): raise ValueError("Application is not callable: %r" % app) for plugin in plugins or []: - if isinstance(plugin, basestring): + if isinstance(plugin, str): plugin = load(plugin) app.install(plugin) if server in server_names: server = server_names.get(server) - if isinstance(server, basestring): + if isinstance(server, str): server = load(server) if isinstance(server, type): server = server(host=host, port=port, **kargs) @@ -3067,11 +3052,11 @@ def run(self): if not exists(self.lockfile)\ or mtime(self.lockfile) < time.time() - self.interval - 5: self.status = 'error' - thread.interrupt_main() + _thread.interrupt_main() for path, lmtime in list(files.items()): if not exists(path) or mtime(path) > lmtime: self.status = 'reload' - thread.interrupt_main() + _thread.interrupt_main() break time.sleep(self.interval) @@ -3353,8 +3338,8 @@ def set_syntax(self, syntax): self._tokens = syntax.split() if not syntax in self._re_cache: names = 'block_start block_close line_start inline_start inline_end' - etokens = map(re.escape, self._tokens) - pattern_vars = dict(zip(names.split(), etokens)) + etokens = list(map(re.escape, self._tokens)) + pattern_vars = dict(list(zip(names.split(), etokens))) patterns = (self._re_split, self._re_tok, self._re_inl) patterns = [re.compile(p%pattern_vars) for p in patterns] self._re_cache[syntax] = patterns @@ -3527,13 +3512,13 @@ def wrapper(*args, **kwargs): NORUN = False # If set, run() does nothing. Used by load_app() #: A dict to map HTTP status codes (e.g. 404) to phrases (e.g. 'Not Found') -HTTP_CODES = httplib.responses +HTTP_CODES = http.client.responses HTTP_CODES[418] = "I'm a teapot" # RFC 2324 HTTP_CODES[428] = "Precondition Required" HTTP_CODES[429] = "Too Many Requests" HTTP_CODES[431] = "Request Header Fields Too Large" HTTP_CODES[511] = "Network Authentication Required" -_HTTP_STATUS_LINES = dict((k, '%d %s'%(k,v)) for (k,v) in HTTP_CODES.items()) +_HTTP_STATUS_LINES = dict((k, '%d %s'%(k,v)) for (k,v) in list(HTTP_CODES.items())) #: The default template used for error pages. Override with @error() ERROR_PAGE_TEMPLATE = """ diff --git a/keepnote/some.db b/keepnote/some.db new file mode 100644 index 000000000..e69de29bb diff --git a/keepnote/sqlitedict.py b/keepnote/sqlitedict.py old mode 100755 new mode 100644 index bbbf39c05..2fae43f25 --- a/keepnote/sqlitedict.py +++ b/keepnote/sqlitedict.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# -# Copyright (C) 2011 Radim Rehurek + # Hacked together from: # * http://code.activestate.com/recipes/576638-draft-for-an-sqlite3-based-dbm/ @@ -31,18 +30,90 @@ import tempfile import random import logging -from cPickle import dumps, loads, HIGHEST_PROTOCOL as PICKLE_PROTOCOL -from UserDict import DictMixin -from Queue import Queue +from pickle import dumps, loads, HIGHEST_PROTOCOL as PICKLE_PROTOCOL +from collections.abc import MutableMapping + +logger = logging.getLogger('sqlitedict') from threading import Thread +from queue import Queue +from threading import Thread +from queue import Queue +import sqlite3 +import sys -logger = logging.getLogger('sqlitedict') +class SqliteMultithread(Thread): + """ + Wrap sqlite connection in a way that allows concurrent requests from multiple threads. + """ + + def __init__(self, filename, autocommit, journal_mode): + super().__init__() + self.filename = filename + self.autocommit = autocommit + self.journal_mode = journal_mode + self.reqs = Queue() # use request queue of unlimited size + self.setDaemon(True) + self.start() + + def run(self): + # Initialize SQLite connection + conn = sqlite3.connect(self.filename, check_same_thread=False) + conn.execute(f'PRAGMA journal_mode = {self.journal_mode}') + conn.text_factory = str + cursor = conn.cursor() + + while True: + req, arg, res = self.reqs.get() + if req == '--close--': + break + elif req == '--commit--': + conn.commit() + else: + try: + cursor.execute(req, arg) + if res: + for rec in cursor: + res.put(rec) + res.put('--no more--') + if self.autocommit: + conn.commit() + except Exception as e: + print(f"SQL Execution Error: {e}") + + conn.close() + + def execute(self, req, arg=None, res=None): + """Non-blocking execution of SQL statements.""" + self.reqs.put((req, arg or tuple(), res)) + + def select(self, req, arg=None): + """Execute a SELECT statement and return the results.""" + res = Queue() # results of the select will appear as items in this queue + self.execute(req, arg, res) + while True: + rec = res.get() + if rec == '--no more--': + break + yield rec + + def select_one(self, req, arg=None): + """Return only the first row of the SELECT, or None if there are no matching rows.""" + try: + return next(iter(self.select(req, arg))) + except StopIteration: + return None + + def commit(self): + self.execute('--commit--') + + def close(self): + self.execute('--close--') def open(*args, **kwargs): - """See documentation of the SqlDict class.""" + """See documentation of the SqliteDict class.""" return SqliteDict(*args, **kwargs) @@ -53,137 +124,105 @@ def encode(obj): def decode(obj): """Deserialize objects retrieved from SQLite.""" - return loads(str(obj)) + return loads(obj) -class SqliteDict(object, DictMixin): +class SqliteDict(MutableMapping): def __init__(self, filename=None, tablename='unnamed', flag='c', - autocommit=False, journal_mode="DELETE"): - """ - Initialize a thread-safe sqlite-backed dictionary. The dictionary will - be a table `tablename` in database file `filename`. A single file (=database) - may contain multiple tables. - - If no `filename` is given, a random file in temp will be used (and deleted - from temp once the dict is closed/deleted). - - If you enable `autocommit`, changes will be committed after each operation - (more inefficient but safer). Otherwise, changes are committed on `self.commit()`, - `self.clear()` and `self.close()`. - - Set `journal_mode` to 'OFF' if you're experiencing sqlite I/O problems - or if you need performance and don't care about crash-consistency. - - The `flag` parameter: - 'c': default mode, open for read/write, creating the db/table if necessary. - 'w': open for r/w, but drop `tablename` contents first (start with empty table) - 'n': create a new database (erasing any existing tables, not just `tablename`!). - - """ + autocommit=True, journal_mode="WAL"): # Change default to WAL self.in_temp = filename is None if self.in_temp: randpart = hex(random.randint(0, 0xffffff))[2:] filename = os.path.join(tempfile.gettempdir(), 'sqldict' + randpart) - if flag == 'n': - if os.path.exists(filename): - os.remove(filename) + if flag == 'n' and os.path.exists(filename): + os.remove(filename) + self.filename = filename self.tablename = tablename - logger.info("opening Sqlite table %r in %s" % (tablename, filename)) - MAKE_TABLE = 'CREATE TABLE IF NOT EXISTS %s (key TEXT PRIMARY KEY, value BLOB)' % self.tablename + logger.info("Opening Sqlite table %r in %s", tablename, filename) + MAKE_TABLE = f'CREATE TABLE IF NOT EXISTS {self.tablename} (key TEXT PRIMARY KEY, value BLOB)' self.conn = SqliteMultithread(filename, autocommit=autocommit, journal_mode=journal_mode) self.conn.execute(MAKE_TABLE) self.conn.commit() + if flag == 'w': self.clear() + def commit(self): + if self.conn is not None: + try: + self.conn.commit() + except sqlite3.OperationalError as e: + logger.error(f"Commit failed: {e}") + raise + + def close(self): + logger.debug("Closing %s", self) + if self.conn is not None: + if not self.conn.autocommit: + try: + self.conn.commit() # Ensure commit before closing + except sqlite3.OperationalError as e: + logger.error(f"Failed to commit on close: {e}") + self.conn.close() + self.conn = None + if self.in_temp: + try: + os.remove(self.filename) + except Exception: + pass + def __enter__(self): return self def __exit__(self, *exc_info): self.close() - def __str__(self): -# return "SqliteDict(%i items in %s)" % (len(self), self.conn.filename) - return "SqliteDict(%s)" % (self.conn.filename) - def __len__(self): - # `select count (*)` is super slow in sqlite (does a linear scan!!) - # As a result, len() is very slow too once the table size grows beyond trivial. - # We could keep the total count of rows ourselves, by means of triggers, - # but that seems too complicated and would slow down normal operation - # (insert/delete etc). - GET_LEN = 'SELECT COUNT(*) FROM %s' % self.tablename + GET_LEN = f'SELECT COUNT(*) FROM {self.tablename}' rows = self.conn.select_one(GET_LEN)[0] return rows if rows is not None else 0 def __bool__(self): - GET_LEN = 'SELECT MAX(ROWID) FROM %s' % self.tablename + GET_LEN = f'SELECT MAX(ROWID) FROM {self.tablename}' return self.conn.select_one(GET_LEN) is not None - def iterkeys(self): - GET_KEYS = 'SELECT key FROM %s ORDER BY rowid' % self.tablename - for key in self.conn.select(GET_KEYS): - yield key[0] + def keys(self): + GET_KEYS = f'SELECT key FROM {self.tablename} ORDER BY rowid' + return [key[0] for key in self.conn.select(GET_KEYS)] - def itervalues(self): - GET_VALUES = 'SELECT value FROM %s ORDER BY rowid' % self.tablename - for value in self.conn.select(GET_VALUES): - yield decode(value[0]) + def values(self): + GET_VALUES = f'SELECT value FROM {self.tablename} ORDER BY rowid' + return [decode(value[0]) for value in self.conn.select(GET_VALUES)] - def iteritems(self): - GET_ITEMS = 'SELECT key, value FROM %s ORDER BY rowid' % self.tablename - for key, value in self.conn.select(GET_ITEMS): - yield key, decode(value) + def items(self): + GET_ITEMS = f'SELECT key, value FROM {self.tablename} ORDER BY rowid' + return [(key, decode(value)) for key, value in self.conn.select(GET_ITEMS)] def __contains__(self, key): - HAS_ITEM = 'SELECT 1 FROM %s WHERE key = ?' % self.tablename + HAS_ITEM = f'SELECT 1 FROM {self.tablename} WHERE key = ?' return self.conn.select_one(HAS_ITEM, (key,)) is not None def __getitem__(self, key): - GET_ITEM = 'SELECT value FROM %s WHERE key = ?' % self.tablename + GET_ITEM = f'SELECT value FROM {self.tablename} WHERE key = ?' item = self.conn.select_one(GET_ITEM, (key,)) if item is None: raise KeyError(key) - return decode(item[0]) def __setitem__(self, key, value): - ADD_ITEM = 'REPLACE INTO %s (key, value) VALUES (?,?)' % self.tablename + ADD_ITEM = f'REPLACE INTO {self.tablename} (key, value) VALUES (?, ?)' self.conn.execute(ADD_ITEM, (key, encode(value))) def __delitem__(self, key): if key not in self: raise KeyError(key) - DEL_ITEM = 'DELETE FROM %s WHERE key = ?' % self.tablename + DEL_ITEM = f'DELETE FROM {self.tablename} WHERE key = ?' self.conn.execute(DEL_ITEM, (key,)) - def update(self, items=(), **kwds): - try: - items = [(k, encode(v)) for k, v in items.iteritems()] - except AttributeError: - pass - - UPDATE_ITEMS = 'REPLACE INTO %s (key, value) VALUES (?, ?)' % self.tablename - self.conn.executemany(UPDATE_ITEMS, items) - if kwds: - self.update(kwds) - - def keys(self): - return list(self.iterkeys()) - - def values(self): - return list(self.itervalues()) - - def items(self): - return list(self.iteritems()) - - def __iter__(self): - return self.iterkeys() - def clear(self): - CLEAR_ALL = 'DELETE FROM %s;' % self.tablename # avoid VACUUM, as it gives "OperationalError: database schema has changed" + CLEAR_ALL = f'DELETE FROM {self.tablename};' self.conn.commit() self.conn.execute(CLEAR_ALL) self.conn.commit() @@ -194,7 +233,7 @@ def commit(self): sync = commit def close(self): - logger.debug("closing %s" % self) + logger.debug("Closing %s", self) if self.conn is not None: if self.conn.autocommit: self.conn.commit() @@ -203,20 +242,16 @@ def close(self): if self.in_temp: try: os.remove(self.filename) - except: + except Exception: pass - def terminate(self): - """Delete the underlying database file. Use with care.""" - self.close() - logger.info("deleting %s" % self.filename) - try: - os.remove(self.filename) - except IOError, e: - logger.warning("failed to delete %s: %s" % (self.filename, e)) + def __iter__(self): + return iter(self.keys()) + + def __str__(self): + return f"SqliteDict({self.conn.filename})" def __del__(self): - # like close(), but assume globals are gone by now (such as the logger) try: if self.conn is not None: if self.conn.autocommit: @@ -225,94 +260,9 @@ def __del__(self): self.conn = None if self.in_temp: os.remove(self.filename) - except: + except Exception: pass -#endclass SqliteDict - - - -class SqliteMultithread(Thread): - """ - Wrap sqlite connection in a way that allows concurrent requests from multiple threads. - - This is done by internally queueing the requests and processing them sequentially - in a separate thread (in the same order they arrived). - """ - def __init__(self, filename, autocommit, journal_mode): - super(SqliteMultithread, self).__init__() - self.filename = filename - self.autocommit = autocommit - self.journal_mode = journal_mode - self.reqs = Queue() # use request queue of unlimited size - self.setDaemon(True) # python2.5-compatible - self.start() - - def run(self): - if self.autocommit: - conn = sqlite3.connect(self.filename, isolation_level=None, check_same_thread=False) - else: - conn = sqlite3.connect(self.filename, check_same_thread=False) - conn.execute('PRAGMA journal_mode = %s' % self.journal_mode) - conn.text_factory = str - cursor = conn.cursor() - cursor.execute('PRAGMA synchronous=OFF') - while True: - req, arg, res = self.reqs.get() - if req == '--close--': - break - elif req == '--commit--': - conn.commit() - else: - cursor.execute(req, arg) - if res: - for rec in cursor: - res.put(rec) - res.put('--no more--') - if self.autocommit: - conn.commit() - conn.close() - - def execute(self, req, arg=None, res=None): - """ - `execute` calls are non-blocking: just queue up the request and return immediately. - - """ - self.reqs.put((req, arg or tuple(), res)) - - def executemany(self, req, items): - for item in items: - self.execute(req, item) - - def select(self, req, arg=None): - """ - Unlike sqlite's native select, this select doesn't handle iteration efficiently. - - The result of `select` starts filling up with values as soon as the - request is dequeued, and although you can iterate over the result normally - (`for res in self.select(): ...`), the entire result will be in memory. - - """ - res = Queue() # results of the select will appear as items in this queue - self.execute(req, arg, res) - while True: - rec = res.get() - if rec == '--no more--': - break - yield rec - - def select_one(self, req, arg=None): - """Return only the first row of the SELECT, or None if there are no matching rows.""" - try: - return iter(self.select(req, arg)).next() - except StopIteration: - return None - - def commit(self): - self.execute('--commit--') - - def close(self): - self.execute('--close--') #endclass SqliteMultithread @@ -336,14 +286,14 @@ def close(self): d['abc'] = 'lmno' d['xyz'] = 'pdq' assert len(d) == 2 - assert list(d.iteritems()) == [('abc', 'lmno'), ('xyz', 'pdq')] - assert d.items() == [('abc', 'lmno'), ('xyz', 'pdq')] - assert d.values() == ['lmno', 'pdq'] - assert d.keys() == ['abc', 'xyz'] + assert list(d.items()) == [('abc', 'lmno'), ('xyz', 'pdq')] + assert list(d.items()) == [('abc', 'lmno'), ('xyz', 'pdq')] + assert list(d.values()) == ['lmno', 'pdq'] + assert list(d.keys()) == ['abc', 'xyz'] assert list(d) == ['abc', 'xyz'] d.update(p='x', q='y', r='z') assert len(d) == 5 - assert d.items() == [('abc', 'lmno'), ('xyz', 'pdq'), ('q', 'y'), ('p', 'x'), ('r', 'z')] + assert list(d.items()) == [('abc', 'lmno'), ('xyz', 'pdq'), ('q', 'y'), ('p', 'x'), ('r', 'z')] del d['abc'] try: error = d['abc'] @@ -367,4 +317,4 @@ def close(self): d.clear() assert not d d.close() - print 'all tests passed :-)' + print('all tests passed :-)') diff --git a/keepnote/tarfile.py b/keepnote/tarfile.py index 1dfeeb2f9..2b6ee5617 100644 --- a/keepnote/tarfile.py +++ b/keepnote/tarfile.py @@ -1,32 +1,6 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -#------------------------------------------------------------------- -# tarfile.py -#------------------------------------------------------------------- -# Copyright (C) 2002 Lars Gustbel -# All rights reserved. -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following -# conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# + """Read from and write to tar format archives. """ @@ -58,7 +32,7 @@ # handling. In many places it is assumed a simple substitution of / by the # local os.path.sep is good enough to convert pathnames, but this does not # work with the mac rooted:path:name versus :nonrooted:path:name syntax - raise ImportError, "tarfile does not work for platform==mac" + raise ImportError("tarfile does not work for platform==mac") try: import grp, pwd @@ -140,26 +114,26 @@ #--------------------------------------------------------- # Bits used in the mode field, values in octal. #--------------------------------------------------------- -S_IFLNK = 0120000 # symbolic link -S_IFREG = 0100000 # regular file -S_IFBLK = 0060000 # block device -S_IFDIR = 0040000 # directory -S_IFCHR = 0020000 # character device -S_IFIFO = 0010000 # fifo - -TSUID = 04000 # set UID on execution -TSGID = 02000 # set GID on execution -TSVTX = 01000 # reserved - -TUREAD = 0400 # read by owner -TUWRITE = 0200 # write by owner -TUEXEC = 0100 # execute/search by owner -TGREAD = 0040 # read by group -TGWRITE = 0020 # write by group -TGEXEC = 0010 # execute/search by group -TOREAD = 0004 # read by other -TOWRITE = 0002 # write by other -TOEXEC = 0001 # execute/search by other +S_IFLNK = 0o120000 # symbolic link +S_IFREG = 0o100000 # regular file +S_IFBLK = 0o060000 # block device +S_IFDIR = 0o040000 # directory +S_IFCHR = 0o020000 # character device +S_IFIFO = 0o010000 # fifo + +TSUID = 0o4000 # set UID on execution +TSGID = 0o2000 # set GID on execution +TSVTX = 0o1000 # reserved + +TUREAD = 0o400 # read by owner +TUWRITE = 0o200 # write by owner +TUEXEC = 0o100 # execute/search by owner +TGREAD = 0o040 # read by group +TGWRITE = 0o020 # write by group +TGEXEC = 0o010 # execute/search by group +TOREAD = 0o004 # read by other +TOWRITE = 0o002 # write by other +TOEXEC = 0o001 # execute/search by other #--------------------------------------------------------- # initialization @@ -191,14 +165,14 @@ def nti(s): """ # There are two possible encodings for a number field, see # itn() below. - if s[0] != chr(0200): + if s[0] != chr(0o200): try: n = int(nts(s) or "0", 8) except ValueError: raise HeaderError("invalid header") else: - n = 0L - for i in xrange(len(s) - 1): + n = 0 + for i in range(len(s) - 1): n <<= 8 n += ord(s[i + 1]) return n @@ -224,10 +198,10 @@ def itn(n, digits=8, format=DEFAULT_FORMAT): n = struct.unpack("L", struct.pack("l", n))[0] s = "" - for i in xrange(digits - 1): - s = chr(n & 0377) + s + for i in range(digits - 1): + s = chr(n & 0o377) + s n >>= 8 - s = chr(0200) + s + s = chr(0o200) + s return s def uts(s, encoding, errors): @@ -275,7 +249,7 @@ def copyfileobj(src, dst, length=None): BUFSIZE = 16 * 1024 blocks, remainder = divmod(length, BUFSIZE) - for b in xrange(blocks): + for b in range(blocks): buf = src.read(BUFSIZE) if len(buf) < BUFSIZE: raise IOError("end of file reached") @@ -412,7 +386,7 @@ def __init__(self, name, mode, comptype, fileobj, bufsize): self.fileobj = fileobj self.bufsize = bufsize self.buf = "" - self.pos = 0L + self.pos = 0 self.closed = False if comptype == "gz": @@ -421,7 +395,7 @@ def __init__(self, name, mode, comptype, fileobj, bufsize): except ImportError: raise CompressionError("zlib module is not available") self.zlib = zlib - self.crc = zlib.crc32("") & 0xffffffffL + self.crc = zlib.crc32("") & 0xffffffff if mode == "r": self._init_read_gz() else: @@ -449,7 +423,7 @@ def _init_write_gz(self): -self.zlib.MAX_WBITS, self.zlib.DEF_MEM_LEVEL, 0) - timestamp = struct.pack("= 0: blocks, remainder = divmod(pos - self.pos, self.bufsize) - for i in xrange(blocks): + for i in range(blocks): self.read(self.bufsize) self.read(remainder) else: @@ -920,7 +894,7 @@ def __init__(self, name=""): of the member. """ self.name = name # member name - self.mode = 0644 # file permissions + self.mode = 0o644 # file permissions self.uid = 0 # user id self.gid = 0 # group id self.size = 0 # file size @@ -966,7 +940,7 @@ def get_info(self, encoding, errors): info = { "name": normpath(self.name), - "mode": self.mode & 07777, + "mode": self.mode & 0o7777, "uid": self.uid, "gid": self.gid, "size": self.size, @@ -984,7 +958,7 @@ def get_info(self, encoding, errors): info["name"] += "/" for key in ("name", "linkname", "uname", "gname"): - if type(info[key]) is unicode: + if type(info[key]) is str: info[key] = info[key].encode(encoding, errors) return info @@ -1070,7 +1044,7 @@ def create_pax_header(self, info, encoding, errors): val = info[name] if not 0 <= val < 8 ** (digits - 1) or isinstance(val, float): - pax_headers[name] = unicode(val) + pax_headers[name] = str(val) info[name] = 0 # Create a pax extended header if necessary. @@ -1109,7 +1083,7 @@ def _create_header(info, format): """ parts = [ stn(info.get("name", ""), 100), - itn(info.get("mode", 0) & 07777, 8, format), + itn(info.get("mode", 0) & 0o7777, 8, format), itn(info.get("uid", 0), 8, format), itn(info.get("gid", 0), 8, format), itn(info.get("size", 0), 12, format), @@ -1164,7 +1138,7 @@ def _create_pax_generic_header(cls, pax_headers, type=XHDTYPE): must be unicode objects. """ records = [] - for keyword, value in pax_headers.iteritems(): + for keyword, value in pax_headers.items(): keyword = keyword.encode("utf8") value = value.encode("utf8") l = len(keyword) + len(value) + 3 # ' ' + '=' + '\n' @@ -1313,11 +1287,11 @@ def _proc_sparse(self, tarfile): buf = self.buf sp = _ringbuffer() pos = 386 - lastpos = 0L - realpos = 0L + lastpos = 0 + realpos = 0 # There are 4 possible sparse structs in the # first header. - for i in xrange(4): + for i in range(4): try: offset = nti(buf[pos:pos + 12]) numbytes = nti(buf[pos + 12:pos + 24]) @@ -1338,7 +1312,7 @@ def _proc_sparse(self, tarfile): while isextended == 1: buf = tarfile.fileobj.read(BLOCKSIZE) pos = 0 - for i in xrange(21): + for i in range(21): try: offset = nti(buf[pos:pos + 12]) numbytes = nti(buf[pos + 12:pos + 24]) @@ -1425,7 +1399,7 @@ def _apply_pax_info(self, pax_headers, encoding, errors): """Replace fields with supplemental information from a previous pax extended or global header. """ - for keyword, value in pax_headers.iteritems(): + for keyword, value in pax_headers.items(): if keyword not in PAX_FIELDS: continue @@ -1576,14 +1550,14 @@ def __init__(self, name=None, mode="r", fileobj=None, format=None, if self.mode == "r": self.firstmember = None - self.firstmember = self.next() + self.firstmember = next(self) if self.mode == "a": # Move to the end of the archive, # before the first empty block. self.firstmember = None while True: - if self.next() is None: + if next(self) is None: if self.offset > 0: self.fileobj.seek(- BLOCKSIZE, 1) break @@ -1653,7 +1627,7 @@ def open(cls, name=None, mode="r", fileobj=None, bufsize=RECORDSIZE, **kwargs): saved_pos = fileobj.tell() try: return func(name, "r", fileobj, **kwargs) - except (ReadError, CompressionError), e: + except (ReadError, CompressionError) as e: if fileobj is not None: fileobj.seek(saved_pos) continue @@ -1885,7 +1859,7 @@ def gettarinfo(self, name=None, arcname=None, fileobj=None): if stat.S_ISREG(stmd): tarinfo.size = statres.st_size else: - tarinfo.size = 0L + tarinfo.size = 0 tarinfo.mtime = statres.st_mtime tarinfo.type = type tarinfo.linkname = linkname @@ -1915,28 +1889,28 @@ def list(self, verbose=True): for tarinfo in self: if verbose: - print filemode(tarinfo.mode), - print "%s/%s" % (tarinfo.uname or tarinfo.uid, - tarinfo.gname or tarinfo.gid), + print(filemode(tarinfo.mode), end=' ') + print("%s/%s" % (tarinfo.uname or tarinfo.uid, + tarinfo.gname or tarinfo.gid), end=' ') if tarinfo.ischr() or tarinfo.isblk(): - print "%10s" % ("%d,%d" \ - % (tarinfo.devmajor, tarinfo.devminor)), + print("%10s" % ("%d,%d" \ + % (tarinfo.devmajor, tarinfo.devminor)), end=' ') else: - print "%10d" % tarinfo.size, - print "%d-%02d-%02d %02d:%02d:%02d" \ - % time.localtime(tarinfo.mtime)[:6], + print("%10d" % tarinfo.size, end=' ') + print("%d-%02d-%02d %02d:%02d:%02d" \ + % time.localtime(tarinfo.mtime)[:6], end=' ') if tarinfo.isdir(): - print tarinfo.name + "/" + print(tarinfo.name + "/") else: - print tarinfo.name + print(tarinfo.name) if verbose: if tarinfo.issym(): - print "->", tarinfo.linkname, + print("->", tarinfo.linkname, end=' ') if tarinfo.islnk(): - print "link to", tarinfo.linkname, - print + print("link to", tarinfo.linkname, end=' ') + print() def add(self, name, arcname=None, recursive=True, exclude=None): """Add the file `name' to the archive. `name' may be any type of file @@ -2038,7 +2012,7 @@ def extractall(self, path=".", members=None): # Extract directories with a safe mode. directories.append(tarinfo) tarinfo = copy.copy(tarinfo) - tarinfo.mode = 0700 + tarinfo.mode = 0o700 self.extract(tarinfo, path) # Reverse sort directories. @@ -2052,7 +2026,7 @@ def extractall(self, path=".", members=None): self.chown(tarinfo, dirpath) self.utime(tarinfo, dirpath) self.chmod(tarinfo, dirpath) - except ExtractError, e: + except ExtractError as e: if self.errorlevel > 1: raise else: @@ -2066,7 +2040,7 @@ def extract(self, member, path=""): """ self._check("r") - if isinstance(member, basestring): + if isinstance(member, str): tarinfo = self.getmember(member) else: tarinfo = member @@ -2077,7 +2051,7 @@ def extract(self, member, path=""): try: self._extract_member(tarinfo, os.path.join(path, tarinfo.name)) - except EnvironmentError, e: + except EnvironmentError as e: if self.errorlevel > 0: raise else: @@ -2085,7 +2059,7 @@ def extract(self, member, path=""): self._dbg(1, "tarfile: %s" % e.strerror) else: self._dbg(1, "tarfile: %s %r" % (e.strerror, e.filename)) - except ExtractError, e: + except ExtractError as e: if self.errorlevel > 1: raise else: @@ -2102,7 +2076,7 @@ def extractfile(self, member): """ self._check("r") - if isinstance(member, basestring): + if isinstance(member, str): tarinfo = self.getmember(member) else: tarinfo = member @@ -2184,8 +2158,8 @@ def makedir(self, tarinfo, targetpath): try: # Use a safe mode for the directory, the real mode is set # later in _extract_member(). - os.mkdir(targetpath, 0700) - except EnvironmentError, e: + os.mkdir(targetpath, 0o700) + except EnvironmentError as e: if e.errno != errno.EEXIST: raise @@ -2249,11 +2223,11 @@ def makelink(self, tarinfo, targetpath): try: self._extract_member(self.getmember(linkpath), targetpath) - except (EnvironmentError, KeyError), e: + except (EnvironmentError, KeyError) as e: linkpath = os.path.normpath(linkpath) try: shutil.copy2(linkpath, targetpath) - except EnvironmentError, e: + except EnvironmentError as e: raise IOError("link could not be created") def chown(self, tarinfo, targetpath): @@ -2281,7 +2255,7 @@ def chown(self, tarinfo, targetpath): else: if sys.platform != "os2emx": os.chown(targetpath, u, g) - except EnvironmentError, e: + except EnvironmentError as e: raise ExtractError("could not change owner") def chmod(self, tarinfo, targetpath): @@ -2290,7 +2264,7 @@ def chmod(self, tarinfo, targetpath): if hasattr(os, 'chmod'): try: os.chmod(targetpath, tarinfo.mode) - except EnvironmentError, e: + except EnvironmentError as e: raise ExtractError("could not change mode") def utime(self, tarinfo, targetpath): @@ -2300,11 +2274,11 @@ def utime(self, tarinfo, targetpath): return try: os.utime(targetpath, (tarinfo.mtime, tarinfo.mtime)) - except EnvironmentError, e: + except EnvironmentError as e: raise ExtractError("could not change modification time") #-------------------------------------------------------------------------- - def next(self): + def __next__(self): """Return the next member of the archive as a TarInfo object, when TarFile is opened for reading. Return None if there is no more available. @@ -2324,7 +2298,7 @@ def next(self): return self.members.append(tarinfo) - except HeaderError, e: + except HeaderError as e: if self.ignore_zeros: self._dbg(2, "0x%X: %s" % (self.offset, e)) self.offset += BLOCKSIZE @@ -2352,7 +2326,7 @@ def _getmember(self, name, tarinfo=None): else: end = members.index(tarinfo) - for i in xrange(end - 1, -1, -1): + for i in range(end - 1, -1, -1): if name == members[i].name: return members[i] @@ -2361,7 +2335,7 @@ def _load(self): members. """ while True: - tarinfo = self.next() + tarinfo = next(self) if tarinfo is None: break self._loaded = True @@ -2387,7 +2361,7 @@ def _dbg(self, level, msg): """Write debugging output to sys.stderr. """ if level <= self.debug: - print >> sys.stderr, msg + print(msg, file=sys.stderr) # class TarFile class TarIter: @@ -2406,7 +2380,7 @@ def __iter__(self): """Return iterator object. """ return self - def next(self): + def __next__(self): """Return the next item using TarFile's next() method. When all members have been read, set TarFile as _loaded. """ @@ -2414,7 +2388,7 @@ def next(self): # happen that getmembers() is called during iteration, # which will cause TarIter to stop prematurely. if not self.tarfile._loaded: - tarinfo = self.tarfile.next() + tarinfo = next(self.tarfile) if not tarinfo: self.tarfile._loaded = True raise StopIteration @@ -2495,10 +2469,9 @@ def __init__(self, file, mode="r", compression=TAR_PLAIN): m.file_size = m.size m.date_time = time.gmtime(m.mtime)[:6] def namelist(self): - return map(lambda m: m.name, self.infolist()) + return [m.name for m in self.infolist()] def infolist(self): - return filter(lambda m: m.type in REGULAR_TYPES, - self.tarfile.getmembers()) + return [m for m in self.tarfile.getmembers() if m.type in REGULAR_TYPES] def printdir(self): self.tarfile.list() def testzip(self): @@ -2511,9 +2484,9 @@ def write(self, filename, arcname=None, compress_type=None): self.tarfile.add(filename, arcname) def writestr(self, zinfo, bytes): try: - from cStringIO import StringIO + from io import StringIO except ImportError: - from StringIO import StringIO + from io import StringIO import calendar tinfo = TarInfo(zinfo.filename) tinfo.size = len(bytes) diff --git a/keepnote/tasklib.py b/keepnote/tasklib.py index ab6030cc0..268c8630b 100644 --- a/keepnote/tasklib.py +++ b/keepnote/tasklib.py @@ -5,24 +5,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# import sys import threading diff --git a/keepnote/teefile.py b/keepnote/teefile.py index 4ab0dcc24..712189bb0 100644 --- a/keepnote/teefile.py +++ b/keepnote/teefile.py @@ -7,24 +7,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# class TeeFileStream (object): diff --git a/keepnote/timestamp.py b/keepnote/timestamp.py index e4d85b8cf..189eb0d4c 100644 --- a/keepnote/timestamp.py +++ b/keepnote/timestamp.py @@ -6,24 +6,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# import locale import time @@ -63,7 +45,7 @@ TM_SEC, TM_WDAY, TM_YDAY, - TM_ISDST) = range(9) + TM_ISDST) = list(range(9)) """ @@ -97,10 +79,10 @@ DEFAULT_TIMESTAMP_FORMATS = { - "same_day": u"%I:%M %p", - "same_month": u"%a, %d %I:%M %p", - "same_year": u"%a, %b %d %I:%M %p", - "diff_year": u"%a, %b %d, %Y" + "same_day": "%I:%M %p", + "same_month": "%a, %d %I:%M %p", + "same_year": "%a, %b %d %I:%M %p", + "diff_year": "%a, %b %d, %Y" } @@ -152,7 +134,7 @@ def get_str_timestamp(timestamp, current=None, return time.strftime(formats["diff_year"].encode(ENCODING), local).decode(ENCODING) except: - return u"[formatting error]" + return "[formatting error]" def format_timestamp(timestamp, format): diff --git a/keepnote/trans.py b/keepnote/trans.py index b19bbbf7b..7aa569127 100644 --- a/keepnote/trans.py +++ b/keepnote/trans.py @@ -3,24 +3,7 @@ Translation module """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# + import os import gettext @@ -38,8 +21,8 @@ # global translation object -GETTEXT_DOMAIN = 'keepnote' -_locale_dir = u"." +GETTEXT_DOMAIN = 'keepnote.py' +_locale_dir = "." _translation = None _lang = None @@ -63,7 +46,7 @@ def set_env(key, val): if os.environ.get(key, "") == val: return - setstr = u"%s=%s" % (key, val) + setstr = "%s=%s" % (key, val) #setstr = x.encode(locale.getpreferredencoding()) msvcrt._putenv(setstr) diff --git a/keepnote/undo.py b/keepnote/undo.py index 02376e66c..e4f11af39 100644 --- a/keepnote/undo.py +++ b/keepnote/undo.py @@ -4,26 +4,6 @@ UndoStack for maintaining undo and redo actions """ - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - import sys from keepnote.linked_list import LinkedList @@ -48,7 +28,7 @@ def f(): class UndoStack (object): """UndoStack for maintaining undo and redo actions""" - def __init__(self, maxsize=sys.maxint): + def __init__(self, maxsize=sys.maxsize): """maxsize -- maximum size of undo list""" # stacks maintaining (undo,redo) pairs @@ -138,7 +118,7 @@ def end_action(self): if self._group_counter == 0: if len(self._pending_actions) > 0: - actions, undos = zip(*self._pending_actions) + actions, undos = list(zip(*self._pending_actions)) self._undo_actions.append((cat_funcs(actions), cat_funcs(reversed(undos)))) diff --git a/keepnote/util.py b/keepnote/util.py index 20ac2cf30..6a6062f7d 100644 --- a/keepnote/util.py +++ b/keepnote/util.py @@ -4,27 +4,6 @@ utilities """ - -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - - class PushIter (object): """ Wrap an iterator in another iterator that allows one to push new @@ -37,11 +16,11 @@ def __init__(self, it): def __iter__(self): return self - def next(self): + def __next__(self): if len(self._queue) > 0: return self._queue.pop() else: - return self._it.next() + return next(self._it) def push(self, item): """Push a new item onto the front of the iteration stream""" @@ -64,7 +43,7 @@ def compose(*funcs): compose(f,g)(x) <==> f(g(x)) """ funcs = reversed(funcs) - f = funcs.next() + f = next(funcs) for g in funcs: f = compose2(g, f) return f diff --git a/keepnote/util/__init__.py b/keepnote/util/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/keepnote/util/iterutils.py b/keepnote/util/iterutils.py new file mode 100644 index 000000000..cc9745e3e --- /dev/null +++ b/keepnote/util/iterutils.py @@ -0,0 +1,18 @@ +class PushIter: + """ + A wrapper around an iterator that allows pushing items back onto the front. + """ + def __init__(self, iterable): + self._iter = iter(iterable) + self._pushback = [] + + def __iter__(self): + return self + + def __next__(self): + if self._pushback: + return self._pushback.pop() + return next(self._iter) + + def push(self, item): + self._pushback.append(item) diff --git a/keepnote/util/platform.py b/keepnote/util/platform.py new file mode 100644 index 000000000..ed7fd2fed --- /dev/null +++ b/keepnote/util/platform.py @@ -0,0 +1,58 @@ +# keepnote.py/utils/platform.py +import sys +import os + +import keepnote.trans +# 获取模块路径（对应 keepnote.py 包所在目录） +BASEDIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")) + +def get_platform(): + if sys.platform == "darwin": + return "darwin" + elif sys.platform.startswith("win"): + return "windows" + elif sys.platform.startswith("linux"): + return "linux" + return "unknown" + + +def get_resource(*path_list): + return os.path.join(BASEDIR, *path_list) + +def unicode_gtk(text): + if text is None: + return None + if isinstance(text, bytes): + return text.decode("utf-8", errors="replace") + return text # Already a string in Python 3 + +# keepnote.py/util/perform.py + + + +def translate(message): + """Translate a message using keepnote.py.trans.translate.""" + return keepnote.trans.translate(message) + + +def compose(*funcs): + """ + Compose multiple functions from right to left. + + Example: + compose(str, int)(x) == str(int(x)) + + Args: + *funcs: Variable number of functions to compose. + + Returns: + A function that applies the given functions in sequence (right-to-left). + """ + + def fn(x): + result = x + for f in reversed(funcs): + result = f(result) + return result + + return fn \ No newline at end of file diff --git a/keepnote/xdg.py b/keepnote/xdg.py index e91969d81..6075622ed 100644 --- a/keepnote/xdg.py +++ b/keepnote/xdg.py @@ -1,51 +1,29 @@ """ Simple implementation of the XDG Base Directory Specification - - http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html - """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# - # python imports import os import sys # constants -ENV_CONFIG = u"XDG_CONFIG_HOME" -ENV_CONFIG_DIRS = u"XDG_CONFIG_DIRS" -ENV_DATA = u"XDG_DATA_HOME" -ENV_DATA_DIRS = u"XDG_DATA_DIRS" +ENV_CONFIG = "XDG_CONFIG_HOME" +ENV_CONFIG_DIRS = "XDG_CONFIG_DIRS" +ENV_DATA = "XDG_DATA_HOME" +ENV_DATA_DIRS = "XDG_DATA_DIRS" -DEFAULT_CONFIG_DIR = u".config" -DEFAULT_CONFIG_DIRS = u"/etc/xdg" -DEFAULT_DATA_DIR = u".local/share" -DEFAULT_DATA_DIRS = u"/usr/local/share/:/usr/share/" +DEFAULT_CONFIG_DIR = ".config" +DEFAULT_CONFIG_DIRS = "/etc/xdg" +DEFAULT_DATA_DIR = ".local/share" +DEFAULT_DATA_DIRS = "/usr/local/share/:/usr/share/" # global cache g_config_dirs = None g_data_dirs = None -class XdgError (StandardError): +class XdgError (Exception): pass @@ -58,11 +36,11 @@ def ensure_unicode(text, encoding="utf8"): if text is None: return None - if not isinstance(text, unicode): + if not isinstance(text, str): if encoding == FS_ENCODING: - return unicode(text, sys.getfilesystemencoding()) + return str(text, sys.getfilesystemencoding()) else: - return unicode(text, encoding) + return str(text, encoding) return text @@ -98,7 +76,7 @@ def get_config_dirs(home=None, cache=True): config_dirs = DEFAULT_CONFIG_DIRS # make config path - config_dirs = [config] + config_dirs.split(u":") + config_dirs = [config] + config_dirs.split(":") if cache: g_config_dirs = config_dirs @@ -136,7 +114,7 @@ def get_data_dirs(home=None, cache=True): data_dirs = DEFAULT_DATA_DIRS # make data path - data_dirs = [data] + data_dirs.split(u":") + data_dirs = [data] + data_dirs.split(":") if cache: g_data_dirs = data_dirs @@ -199,7 +177,7 @@ def make_config_dir(dirname, config_dirs=None, config_dir = os.path.join(config_dirs[0], dirname) if not os.path.exists(config_dir): - os.makedirs(config_dir, mode=0700) + os.makedirs(config_dir, mode=0o700) def make_data_dir(dirname, data_dirs=None, @@ -212,4 +190,4 @@ def make_data_dir(dirname, data_dirs=None, data_dir = os.path.join(data_dirs[0], dirname) if not os.path.exists(data_dir): - os.makedirs(data_dir, mode=0700) + os.makedirs(data_dir, mode=0o700) diff --git a/make-lang.sh b/make-lang.sh old mode 100755 new mode 100644 diff --git a/package.json b/package.json index 7969d8428..a27da095f 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,27 @@ { + "name": "keepnote", + "version": "0.7.9", + "description": "Note-taking and organization", + "license": "MIT", + "homepage": "http://keepnote.org", + "private": true, "dependencies": { - "backbone": "^1.1.2", - "bower": "^1.3.12", - "del": "^1.1.1", - "gulp": "^3.8.11", - "gulp-bower-normalize": "^1.0.3", - "jasmine": "^2.2.1", - "jest-cli": "git://github.com/facebook/jest.git", - "jquery": "^2.1.1", - "jsdom": "^3.1.2", - "main-bower-files": "^2.5.0" + "bootstrap": "^3.4.1", + "jquery": "^3.7.1", + "backbone": "^1.5.0", + "react": "^18.3.1", + "wysihtml": "^0.5.5", + "xmldom": "^0.6.0", + "gulp": "^4.0.2", + "del": "^7.1.0" + }, + "devDependencies": { + "jest": "^29.7.0", + "jsdom": "^24.1.1" }, "scripts": { - "test": "jasmine" + "test": "jest", + "build": "gulp", + "clean": "gulp clean" } -} +} \ No newline at end of file diff --git a/pkg/deb/debian/rules b/pkg/deb/debian/rules old mode 100755 new mode 100644 diff --git a/pkg/deb/make-deb.sh b/pkg/deb/make-deb.sh old mode 100755 new mode 100644 index 87eb4e4fb..9b15a5360 --- a/pkg/deb/make-deb.sh +++ b/pkg/deb/make-deb.sh @@ -8,7 +8,7 @@ fi # configure export DEBFULLNAME="Matt Rasmussen" export DEBEMAIL="rasmus@alum.mit.edu" -PKG_NAME=keepnote +PKG_NAME=keepnote.py PKG_VERSION="$1" diff --git a/pkg/win/build.sh b/pkg/win/build.sh old mode 100755 new mode 100644 diff --git a/pkg/win/fix_pe.py b/pkg/win/fix_pe.py index e5d5d602a..41b781dda 100644 --- a/pkg/win/fix_pe.py +++ b/pkg/win/fix_pe.py @@ -9,19 +9,19 @@ from keepnote import PROGRAM_VERSION_TEXT import pefile -exe_file = 'dist/keepnote-%s.win/keepnote.exe' % PROGRAM_VERSION_TEXT +exe_file = 'dist/keepnote.py-%s.win/keepnote.py.exe' % PROGRAM_VERSION_TEXT # read PE file pe = pefile.PE(exe_file) -print "old OPTIONAL_HEADER.SizeOfImage =", hex(pe.OPTIONAL_HEADER.SizeOfImage) +print("old OPTIONAL_HEADER.SizeOfImage =", hex(pe.OPTIONAL_HEADER.SizeOfImage)) # recalculate image size size = pe.sections[-1].VirtualAddress + pe.sections[-1].Misc_VirtualSize pe.OPTIONAL_HEADER.SizeOfImage = size -print "new OPTIONAL_HEADER.SizeOfImage =", hex(size) +print("new OPTIONAL_HEADER.SizeOfImage =", hex(size)) # write new PE file diff --git a/pkg/win/make-win-installer-src.py b/pkg/win/make-win-installer-src.py index f69873af0..8bad9b465 100644 --- a/pkg/win/make-win-installer-src.py +++ b/pkg/win/make-win-installer-src.py @@ -13,7 +13,7 @@ "${VERSION}": PROGRAM_VERSION_TEXT } -for old, new in variables.items(): +for old, new in list(variables.items()): src = src.replace(old, new) -print src +print(src) diff --git a/pkg/win/post_py2exe.py b/pkg/win/post_py2exe.py index 8d73fe057..1cb6949da 100644 --- a/pkg/win/post_py2exe.py +++ b/pkg/win/post_py2exe.py @@ -5,13 +5,13 @@ import keepnote -dest = "dist/keepnote-%s.win/" % keepnote.PROGRAM_VERSION_TEXT +dest = "dist/keepnote.py-%s.win/" % keepnote.PROGRAM_VERSION_TEXT def include(src, dest, exclude=[]): if not os.path.exists(dest): - print "copying %s..." % dest + print("copying %s..." % dest) # ensure base exists base = os.path.split(dest)[0] @@ -25,7 +25,7 @@ def include(src, dest, exclude=[]): def prune(path): if os.path.exists(path): - print "pruning %s..." % path + print("pruning %s..." % path) if os.path.isdir(path): shutil.rmtree(path) else: diff --git a/pywin.py b/pywin.py index fc6fef219..aefc2a3bf 100644 --- a/pywin.py +++ b/pywin.py @@ -4,24 +4,6 @@ """ -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# import os diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..d904acbaa --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +sgmllib3k~=1.0.0 +PyGObject~=3.50.0 +pycairo~=1.27.0 +waitress~=3.0.2 +Paste~=3.10.1 + +setuptools~=77.0.3 \ No newline at end of file diff --git a/setup.py b/setup.py index c4ec64bb4..56ada5783 100644 --- a/setup.py +++ b/setup.py @@ -1,67 +1,37 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # setup for KeepNote # # use the following command to install KeepNote: -# python setup.py install +# pip install -e . # -#============================================================================= +# ============================================================================= -# -# KeepNote -# Copyright (c) 2008-2011 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -#============================================================================= -# constants +# ============================================================================= +# Constants import keepnote KEEPNOTE_VERSION = keepnote.PROGRAM_VERSION_TEXT - -#============================================================================= -# python and distutils imports -from distutils.core import setup +# ============================================================================= +# Python and setuptools imports +from setuptools import setup, find_packages import itertools import os -import sys - -# py2exe module (if building on windows) -try: - import py2exe - py2exe # ignore pyflake warning. -except ImportError: - pass - -#============================================================================= -# helper functions +# ============================================================================= +# Helper functions def split_path(path): """Splits a path into all of its directories""" - pathlist = [] - while path != "": + while path: path, tail = os.path.split(path) pathlist.append(tail) pathlist.reverse() return pathlist - def get_files(path, exclude=lambda f: False): """Recursively get files from a directory""" files = [] @@ -79,23 +49,20 @@ def walk(path): for f in os.listdir(path): filename = os.path.join(path, f) if exclude(filename): - # exclude certain files + # Exclude certain files continue elif os.path.isdir(filename): - # recurse directories + # Recurse directories walk(filename) else: - # record all other files + # Record all other files files.append(filename) walk(path) return files - -def get_file_lookup(files, prefix_old, prefix_new, - exclude=lambda f: False): +def get_file_lookup(files, prefix_old, prefix_new, exclude=lambda f: False): """Create a dictionary lookup of files""" - if files is None: files = get_files(prefix_old, exclude=exclude) @@ -110,53 +77,45 @@ def get_file_lookup(files, prefix_old, prefix_new, return lookup - def remove_package_dir(filename): i = filename.index("/") return filename[i+1:] +# ============================================================================= +# Resource files/data -#============================================================================= -# resource files/data - -# get resources -rc_files = get_file_lookup(None, "keepnote/rc", "rc") -image_files = get_file_lookup(None, "keepnote/images", "images") -efiles = get_file_lookup(None, "keepnote/extensions", "extensions", +# Get resources +rc_files = get_file_lookup(None, "keepnote.py/rc", "rc") +image_files = get_file_lookup(None, "keepnote.py/images", "images") +efiles = get_file_lookup(None, "keepnote.py/extensions", "extensions", exclude=[".pyc"]) freedesktop_files = [ - # application icon + # Application icon ("share/icons/hicolor/48x48/apps", - ["desktop/keepnote.png"]), + ["desktop/keepnote.py.png"]), - # desktop menu entry + # Desktop menu entry ("share/applications", - ["desktop/keepnote.desktop"])] - + ["desktop/keepnote.py.desktop"]) +] -# get data files -if "py2exe" in sys.argv: - data_files = rc_files.items() + efiles.items() + image_files.items() - package_data = {} +# Get data files +data_files = freedesktop_files +package_data = {'keepnote.py': []} +for v in itertools.chain(list(rc_files.values()), + list(image_files.values()), + list(efiles.values())): + package_data['keepnote.py'].extend([remove_package_dir(f) for f in v]) -else: - data_files = freedesktop_files - package_data = {'keepnote': []} - for v in itertools.chain(rc_files.values(), - image_files.values(), - efiles.values()): - package_data['keepnote'].extend(map(remove_package_dir, v)) - - -#============================================================================= -# setup +# ============================================================================= +# Setup setup( - name='keepnote', + name='keepnote.py', version=KEEPNOTE_VERSION, description='A cross-platform note taking application', long_description=""" - KeepNote is a cross-platform note taking application. Its features + KeepNote is a cross-platform note taking application. Its features include: - rich text editing @@ -176,7 +135,7 @@ def remove_package_dir(filename): author='Matt Rasmussen', author_email='rasmus@alum.mit.edu', url='http://keepnote.org', - download_url='http://keepnote.org/download/keepnote-%s.tar.gz' % KEEPNOTE_VERSION, # nopep8 + download_url='http://keepnote.org/download/keepnote-%s.tar.gz' % KEEPNOTE_VERSION, classifiers=[ 'Development Status :: 5 - Production/Stable', @@ -191,42 +150,34 @@ def remove_package_dir(filename): 'Operating System :: MacOS :: MacOS X', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', - 'Programming Language :: Python', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ], license="GPL", packages=[ - 'keepnote', - 'keepnote.compat', - 'keepnote.gui', - 'keepnote.gui.richtext', - 'keepnote.notebook', - 'keepnote.notebook.connection', - 'keepnote.notebook.connection.fs', - 'keepnote.server', - 'keepnote.mswin' + 'keepnote.py', + 'keepnote.py.compat', + 'keepnote.py.gui', + 'keepnote.py.gui.richtext', + 'keepnote.py.notebook', + 'keepnote.py.notebook.connection', + 'keepnote.py.notebook.connection.fs', + 'keepnote.py.server', + 'keepnote.py.mswin' ], - scripts=['bin/keepnote'], + install_requires=[ + 'pygobject>=3.50.0', + 'pywin32; platform_system=="Windows"', + ], + entry_points={ + 'console_scripts': [ + 'keepnote.py = keepnote.py.main:main', # Adjust if script is moved + ], + }, data_files=data_files, package_data=package_data, - - windows=[{ - 'script': 'bin/keepnote', - 'icon_resources': [(1, 'keepnote/images/keepnote.ico')], - }], - options={ - 'py2exe': { - 'packages': 'encodings', - 'includes': 'cairo,pango,pangocairo,atk,gobject,win32com.shell,win32api,win32com,win32ui,win32gui', # nopep8 - 'dist_dir': 'dist/keepnote-%s.win' % KEEPNOTE_VERSION - }, - #'sdist': { - # 'formats': 'zip', - #} - } -) - - -# execute post-build script -if "py2exe" in sys.argv: - execfile("pkg/win/post_py2exe.py") +) \ No newline at end of file diff --git a/test/data/home-0.6.3/.config/keepnote/extensions/import_basket/__init__.py b/test/data/home-0.6.3/.config/keepnote/extensions/import_basket/__init__.py index f507ba76b..e0168e5ca 100644 --- a/test/data/home-0.6.3/.config/keepnote/extensions/import_basket/__init__.py +++ b/test/data/home-0.6.3/.config/keepnote/extensions/import_basket/__init__.py @@ -235,7 +235,7 @@ class BasketIndexParser(): """ A Basket notepad index file parser: ~/.kde/share/apps/basket/baskets/baskets.xml For each basket node will create a Keepnote node, a basket node can contains many notes(each of them is saved into a note*.html), - in that case all note*.html are merged in a unique keepnote page.html + in that case all note*.html are merged in a unique keepnote.py page.html """ def reset(self): @@ -318,7 +318,7 @@ def createKeepNoteNode(self, parentNode, name, folderName, icon, isLeaf): html_content = self.getMergedHTMLFromBaskets(folderName, xnode.get_data_file()) - # Set the icon for the new keepnote node + # Set the icon for the new keepnote.py node if icon: basename = os.path.basename(icon) basename, ext = os.path.splitext(basename) @@ -329,7 +329,7 @@ def createKeepNoteNode(self, parentNode, name, folderName, icon, isLeaf): icon_file = self.install_icon(icon) xnode.set_attr("icon", icon_file) - # Write text for the new keepnote node into the associated file + # Write text for the new keepnote.py node into the associated file if html_content: write_node(xnode, html_content) diff --git a/test/data/home-0.6.3/.config/keepnote/extensions/import_notecase/__init__.py b/test/data/home-0.6.3/.config/keepnote/extensions/import_notecase/__init__.py index d03387837..f9b9ffc34 100644 --- a/test/data/home-0.6.3/.config/keepnote/extensions/import_notecase/__init__.py +++ b/test/data/home-0.6.3/.config/keepnote/extensions/import_notecase/__init__.py @@ -32,7 +32,7 @@ import base64 import string,random -# keepnote imports +# keepnote.py imports import keepnote import keepnote.gui.extension from keepnote import notebook as notebooklib diff --git a/test/data/notebook/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf b/test/data/notebook/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf index f6d261b70..d07acb10b 100644 Binary files a/test/data/notebook/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf and b/test/data/notebook/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf differ diff --git "a/test/data/notebook/test for drag and drop/drop pages test/dir2/de\314\201ja\314\200 vu/node.xml" "b/test/data/notebook/test for drag and drop/drop pages test/dir2/d\303\251j\303\240 vu/node.xml" similarity index 100% rename from "test/data/notebook/test for drag and drop/drop pages test/dir2/de\314\201ja\314\200 vu/node.xml" rename to "test/data/notebook/test for drag and drop/drop pages test/dir2/d\303\251j\303\240 vu/node.xml" diff --git "a/test/data/notebook/test for drag and drop/drop pages test/dir2/de\314\201ja\314\200 vu/page.html" "b/test/data/notebook/test for drag and drop/drop pages test/dir2/d\303\251j\303\240 vu/page.html" similarity index 100% rename from "test/data/notebook/test for drag and drop/drop pages test/dir2/de\314\201ja\314\200 vu/page.html" rename to "test/data/notebook/test for drag and drop/drop pages test/dir2/d\303\251j\303\240 vu/page.html" diff --git a/test/gui/notebook_update.py b/test/gui/notebook_update.py index 18479720d..b4a023e20 100644 --- a/test/gui/notebook_update.py +++ b/test/gui/notebook_update.py @@ -30,8 +30,8 @@ def test_gui(self): shutil.copytree(old_notebook_filename, new_notebook_filename) - self.assertEquals( - os.system("bin/keepnote --newproc %s" % new_notebook_filename), 0) + self.assertEqual( + os.system("bin/keepnote.py --newproc %s" % new_notebook_filename), 0) if __name__ == "__main__": diff --git a/test/gui/notebook_update.py.bak b/test/gui/notebook_update.py.bak new file mode 100644 index 000000000..18479720d --- /dev/null +++ b/test/gui/notebook_update.py.bak @@ -0,0 +1,39 @@ + +from test.testing import * +import os, shutil, unittest, traceback, sys + + +import keepnote.compat.notebook_v1 as oldnotebooklib +from keepnote.compat import notebook_update_v5_6 +from keepnote import notebook as notebooklib +from keepnote.notebook import update +import keepnote + + +class Update (unittest.TestCase): + + def setUp(self): + pass + + + def test_gui(self): + """test notebook update through gui""" + + new_version = notebooklib.NOTEBOOK_FORMAT_VERSION + old_notebook_filename = "test/data/notebook-v3" + new_notebook_filename = "test/data/notebook-v%d-update" % new_version + + + # make copy of old notebook + if os.path.exists(new_notebook_filename): + shutil.rmtree(new_notebook_filename) + shutil.copytree(old_notebook_filename, + new_notebook_filename) + + self.assertEquals( + os.system("bin/keepnote --newproc %s" % new_notebook_filename), 0) + + +if __name__ == "__main__": + test_main() + diff --git a/test/notebook_changes.py b/test/notebook_changes.py index 1c8b3ed9f..308f35704 100644 --- a/test/notebook_changes.py +++ b/test/notebook_changes.py @@ -1,12 +1,12 @@ import os, shutil, unittest -# keepnote imports +# keepnote.py imports from keepnote import notebook from keepnote.gui.richtext.richtext_html import HtmlBuffer, nest_indent_tags, \ find_paragraphs, P_TAG -import StringIO +import io from keepnote.gui.richtext.richtextbuffer import RichTextBuffer, IGNORE_TAGS, \ RichTextIndentTag @@ -74,7 +74,7 @@ def test_notebook1_to_2(self): def walk(node): if node.get_attr("content_type") == "text/xhtml+xml": - print "rewrite", node.get_data_file() + print("rewrite", node.get_data_file()) filename = node.get_data_file() self.buffer.clear() @@ -91,7 +91,7 @@ def walk(node): walk(book) # should be no differences - print "differences" + print("differences") os.system("diff -r test/data/notebook-v1 test/tmp/notebook-v1-2 > test/tmp/notebook-v1-2.tmp") #self.assertEquals(os.system("diff test/tmp/notebook-v1-2.tmp test/data/notebook-v1-2.diff"), 0) diff --git a/test/notebook_changes.py.bak b/test/notebook_changes.py.bak new file mode 100644 index 000000000..1c8b3ed9f --- /dev/null +++ b/test/notebook_changes.py.bak @@ -0,0 +1,102 @@ +import os, shutil, unittest + +# keepnote imports +from keepnote import notebook + +from keepnote.gui.richtext.richtext_html import HtmlBuffer, nest_indent_tags, \ + find_paragraphs, P_TAG + +import StringIO +from keepnote.gui.richtext.richtextbuffer import RichTextBuffer, IGNORE_TAGS, \ + RichTextIndentTag + +from keepnote.gui.richtext.textbuffer_tools import \ + insert_buffer_contents, \ + normalize_tags, \ + iter_buffer_contents, \ + PushIter, \ + TextBufferDom + + + +class TestCaseNotebookChanges (unittest.TestCase): + + def setUp(self): + pass + + + def setUp_buffer(self): + self.buffer = RichTextBuffer() + self.io = HtmlBuffer() + + def insert(self, buffer, contents): + insert_buffer_contents( + buffer, + buffer.get_iter_at_mark( + buffer.get_insert()), + contents, + add_child=lambda buffer, it, anchor: buffer.add_child(it, anchor), + lookup_tag=lambda tagstr: buffer.tag_table.lookup(tagstr)) + + + def get_contents(self): + return list(iter_buffer_contents(self.buffer, + None, None, IGNORE_TAGS)) + + def read(self, buffer, infile): + contents = list(self.io.read(infile)) + self.insert(self.buffer, contents) + + def write(self, buffer, outfile): + contents = iter_buffer_contents(self.buffer, + None, + None, + IGNORE_TAGS) + self.io.set_output(outfile) + self.io.write(contents, self.buffer.tag_table) + + + + def test_notebook1_to_2(self): + + self.setUp_buffer() + + if os.path.exists("test/tmp/notebook-v1-2"): + shutil.rmtree("test/tmp/notebook-v1-2") + shutil.copytree("test/data/notebook-v1", + "test/tmp/notebook-v1-2") + + + + book = notebook.NoteBook() + book.load("test/tmp/notebook-v1-2") + book.save(force=True) + + def walk(node): + if node.get_attr("content_type") == "text/xhtml+xml": + print "rewrite", node.get_data_file() + + filename = node.get_data_file() + self.buffer.clear() + infile = open(filename) + self.read(self.buffer, infile) + infile.close() + + outfile = open(filename, "w") + self.write(self.buffer, outfile) + outfile.close() + + for child in node.get_children(): + walk(child) + walk(book) + + # should be no differences + print "differences" + os.system("diff -r test/data/notebook-v1 test/tmp/notebook-v1-2 > test/tmp/notebook-v1-2.tmp") + #self.assertEquals(os.system("diff test/tmp/notebook-v1-2.tmp test/data/notebook-v1-2.diff"), 0) + + + +if __name__ == "__main__": + unittest.main() + diff --git a/test/notebook_export_html.py b/test/notebook_export_html.py index ab5a8f901..8e5a7fe49 100644 --- a/test/notebook_export_html.py +++ b/test/notebook_export_html.py @@ -1,6 +1,6 @@ -import os, shutil, unittest, thread, threading, traceback, sys +import os, shutil, unittest, _thread, threading, traceback, sys -# keepnote imports +# keepnote.py imports import keepnote from keepnote import notebook as notebooklib @@ -20,15 +20,15 @@ def test_notebook_lookup_node(self): app.init() ext = app.get_extension("export_html") - print "loading notebook..." + print("loading notebook...") book = notebooklib.NoteBook() book.load("test/data/notebook-v3") - print "clearing output..." + print("clearing output...") if os.path.exists(export_filename): shutil.rmtree(export_filename) - print "exporting..." + print("exporting...") ext.export_notebook(book, export_filename) diff --git a/test/notebook_export_html.py.bak b/test/notebook_export_html.py.bak new file mode 100644 index 000000000..ab5a8f901 --- /dev/null +++ b/test/notebook_export_html.py.bak @@ -0,0 +1,39 @@ +import os, shutil, unittest, thread, threading, traceback, sys + +# keepnote imports +import keepnote +from keepnote import notebook as notebooklib + + + + +class TestCaseNotebookIndex (unittest.TestCase): + + def setUp(self): + pass + + + def test_notebook_lookup_node(self): + + export_filename = "test/tmp/notebook_export" + app = keepnote.KeepNote() + app.init() + ext = app.get_extension("export_html") + + print "loading notebook..." + book = notebooklib.NoteBook() + book.load("test/data/notebook-v3") + + print "clearing output..." + if os.path.exists(export_filename): + shutil.rmtree(export_filename) + + print "exporting..." + ext.export_notebook(book, export_filename) + + +if __name__ == "__main__": + unittest.main() + + + diff --git a/test/notebook_reload.py b/test/notebook_reload.py index 90d0e8faf..a1c59737e 100644 --- a/test/notebook_reload.py +++ b/test/notebook_reload.py @@ -1,8 +1,8 @@ -import os, shutil, unittest, thread, threading, traceback, sys +import os, shutil, unittest, _thread, threading, traceback, sys -from testing import * +from .testing import * -# keepnote imports +# keepnote.py imports import keepnote from keepnote import notebook @@ -20,19 +20,19 @@ def test_notebook_lookup_node(self): filename = "test/data/notebook-v3" path = os.path.join(filename, "stress tests") - app = keepnote.KeepNote("keepnote") + app = keepnote.KeepNote("keepnote.py") book = app.get_notebook(filename) - print "opened '%s'" % book.get_title() - print "\t".join(["%d. '%s'" % (i+1, x.get_title()) - for i, x in enumerate(app.iter_notebooks())]) + print("opened '%s'" % book.get_title()) + print("\t".join(["%d. '%s'" % (i+1, x.get_title()) + for i, x in enumerate(app.iter_notebooks())])) app.close_notebook(book) - print "notebook closed" + print("notebook closed") - print "\t".join(["%d. '%s'" % (i+1, x.get_title()) - for i, x in enumerate(app.iter_notebooks())]) + print("\t".join(["%d. '%s'" % (i+1, x.get_title()) + for i, x in enumerate(app.iter_notebooks())])) - self.assert_(len(list(app.iter_notebooks())) == 0) + self.assertTrue(len(list(app.iter_notebooks())) == 0) if __name__ == "__main__": diff --git a/test/notebook_reload.py.bak b/test/notebook_reload.py.bak new file mode 100644 index 000000000..90d0e8faf --- /dev/null +++ b/test/notebook_reload.py.bak @@ -0,0 +1,40 @@ +import os, shutil, unittest, thread, threading, traceback, sys + +from testing import * + +# keepnote imports +import keepnote +from keepnote import notebook + + + +class NoteBookReload (unittest.TestCase): + + def setUp(self): + pass + + + def test_notebook_lookup_node(self): + + nodeid = "0841d4cc-2605-4fbb-9b3a-db5d4aeed7a6" + filename = "test/data/notebook-v3" + path = os.path.join(filename, "stress tests") + + app = keepnote.KeepNote("keepnote") + book = app.get_notebook(filename) + print "opened '%s'" % book.get_title() + print "\t".join(["%d. '%s'" % (i+1, x.get_title()) + for i, x in enumerate(app.iter_notebooks())]) + app.close_notebook(book) + + print "notebook closed" + + print "\t".join(["%d. '%s'" % (i+1, x.get_title()) + for i, x in enumerate(app.iter_notebooks())]) + + self.assert_(len(list(app.iter_notebooks())) == 0) + + +if __name__ == "__main__": + test_main() + diff --git a/test/notebook_speed.py b/test/notebook_speed.py index 1668ae460..a8d820a63 100644 --- a/test/notebook_speed.py +++ b/test/notebook_speed.py @@ -1,9 +1,9 @@ -from testing import * +from .testing import * -import os, shutil, unittest, thread, threading, traceback, sys, time +import os, shutil, unittest, _thread, threading, traceback, sys, time -# keepnote imports +# keepnote.py imports import keepnote from keepnote import notebook @@ -19,7 +19,7 @@ def setUp(self): def test_open(self): filename = "test/data/notebook-v6" - app = keepnote.KeepNote("keepnote") + app = keepnote.KeepNote("keepnote.py") start = time.time() book = app.get_notebook(filename) @@ -30,7 +30,7 @@ def walk(node): walk(book) t = time.time() - start - print "seconds: ", t + print("seconds: ", t) book.close() @@ -47,13 +47,13 @@ def test_new_node(self): start = time.time() n = book.get_node_by_id("76363514-ac2c-4090-a348-58aa1721db68") - print n + print(n) for i in range(100): - print i + print(i) notebook.new_page(n, str(i)) t = time.time() - start - print "seconds: ", t + print("seconds: ", t) book.close() diff --git a/test/notebook_speed.py.bak b/test/notebook_speed.py.bak new file mode 100644 index 000000000..1668ae460 --- /dev/null +++ b/test/notebook_speed.py.bak @@ -0,0 +1,64 @@ + +from testing import * + +import os, shutil, unittest, thread, threading, traceback, sys, time + +# keepnote imports +import keepnote +from keepnote import notebook + +from test.testing import * + + +class Speed (unittest.TestCase): + + def setUp(self): + pass + + + def test_open(self): + + filename = "test/data/notebook-v6" + app = keepnote.KeepNote("keepnote") + + start = time.time() + book = app.get_notebook(filename) + + def walk(node): + for child in node.get_children(): + walk(child) + walk(book) + + t = time.time() - start + print "seconds: ", t + book.close() + + + def test_new_node(self): + + clean_dir("test/tmp/notebook_new_node") + shutil.copytree("test/data/notebook-v6", + "test/tmp/notebook_new_node") + + book = notebook.NoteBook() + book.load("test/tmp/notebook_new_node") + for n in book.index_all(): pass + + start = time.time() + + n = book.get_node_by_id("76363514-ac2c-4090-a348-58aa1721db68") + print n + for i in range(100): + print i + notebook.new_page(n, str(i)) + + t = time.time() - start + print "seconds: ", t + book.close() + + + + +if __name__ == "__main__": + test_main() + diff --git a/test/pyqt6/__init__.py b/test/pyqt6/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/test/pyqt6/tree_structure_test.py b/test/pyqt6/tree_structure_test.py new file mode 100644 index 000000000..5fc4a1ffc --- /dev/null +++ b/test/pyqt6/tree_structure_test.py @@ -0,0 +1,66 @@ +import sys +from PyQt6.QtWidgets import ( + QApplication, QMainWindow, QTreeWidget, QTreeWidgetItem, QTextEdit, QSplitter, QVBoxLayout, QWidget +) +from PyQt6.QtCore import Qt + + +class NotesApp(QMainWindow): + def __init__(self): + super().__init__() + self.setWindowTitle("PyQt6 Notes Sample with Tree Lines") + self.setGeometry(100, 100, 800, 600) + + # Create the main splitter + splitter = QSplitter(Qt.Orientation.Horizontal) + + # Left panel: Tree view + self.tree = QTreeWidget() + self.tree.setHeaderLabel("Notes Categories") + self.tree.setColumnCount(1) + + # Enable lines in the tree view + self.tree.setRootIsDecorated(True) + self.tree.setIndentation(20) + self.tree.setUniformRowHeights(True) + + self.add_tree_items(self.tree) + self.tree.itemClicked.connect(self.on_tree_item_clicked) + + # Right panel: Text editor + self.editor = QTextEdit() + + # Add widgets to splitter + splitter.addWidget(self.tree) + splitter.addWidget(self.editor) + splitter.setSizes([200, 600]) + + # Main layout + main_layout = QVBoxLayout() + main_layout.addWidget(splitter) + + container = QWidget() + container.setLayout(main_layout) + self.setCentralWidget(container) + + def add_tree_items(self, tree): + # Sample structure + root = QTreeWidgetItem(tree, ["My Software Notes"]) + db_section = QTreeWidgetItem(root, ["MySQL"]) + QTreeWidgetItem(db_section, ["MVCC and Concurrency"]) + QTreeWidgetItem(db_section, ["Transaction Isolation Levels"]) + QTreeWidgetItem(root, ["Java Interview"]) + QTreeWidgetItem(root, ["Python Projects"]) + tree.expandAll() + + def on_tree_item_clicked(self, item, column): + # Example action when a tree item is clicked + content = f"Displaying content for: {item.text(column)}" + self.editor.setText(content) + + +if __name__ == '__main__': + app = QApplication(sys.argv) + window = NotesApp() + window.show() + sys.exit(app.exec()) diff --git a/test/run_all.sh b/test/run_all.sh old mode 100755 new mode 100644 diff --git a/test/testing.py b/test/testing.py index 893b1cea8..4051d8d3b 100644 --- a/test/testing.py +++ b/test/testing.py @@ -32,16 +32,16 @@ def list_tests(stack=0): # get environment var = __import__("__main__").__dict__ - for name, obj in var.iteritems(): + for name, obj in var.items(): if isinstance(obj, type) and issubclass(obj, unittest.TestCase): for attr in dir(obj): if attr.startswith("test"): - print "%s.%s" % (name, attr), + print("%s.%s" % (name, attr), end=' ') doc = getattr(obj, attr).__doc__ if doc: - print "--", doc.split("\n")[0] + print("--", doc.split("\n")[0]) else: - print + print() def test_main(): diff --git a/test/testing.py.bak b/test/testing.py.bak new file mode 100644 index 000000000..893b1cea8 --- /dev/null +++ b/test/testing.py.bak @@ -0,0 +1,58 @@ + +import sys, os, shutil, unittest +import optparse + + +class OptionParser (optparse.OptionParser): + def __init__(self, *args): + optparse.OptionParser.__init__(self, *args) + + def exit(self, code, text): + pass + + + +def clean_dir(path): + if os.path.exists(path): + shutil.rmtree(path) + +def makedirs(path): + if not os.path.exists(path): + os.makedirs(path) + + +def make_clean_dir(path): + if os.path.exists(path): + shutil.rmtree(path) + os.makedirs(path) + + +def list_tests(stack=0): + + # get environment + var = __import__("__main__").__dict__ + + for name, obj in var.iteritems(): + if isinstance(obj, type) and issubclass(obj, unittest.TestCase): + for attr in dir(obj): + if attr.startswith("test"): + print "%s.%s" % (name, attr), + doc = getattr(obj, attr).__doc__ + if doc: + print "--", doc.split("\n")[0] + else: + print + + +def test_main(): + + o = OptionParser() + o.add_option("-l", "--list_tests", action="store_true") + + conf, args = o.parse_args(sys.argv) + + if conf.list_tests: + list_tests(1) + return + + unittest.main() diff --git a/test/wait_dialog.py b/test/wait_dialog.py index 6b3d0229f..6aaf182f6 100644 --- a/test/wait_dialog.py +++ b/test/wait_dialog.py @@ -40,7 +40,7 @@ def func2(): return False gobject.idle_add(func2) elif depth == 1: - print "HERE" + print("HERE") gobject.idle_add(lambda: app.message("Hello", "Hi")) t = 0.0 diff --git a/test/wait_dialog.py.bak b/test/wait_dialog.py.bak new file mode 100644 index 000000000..6b3d0229f --- /dev/null +++ b/test/wait_dialog.py.bak @@ -0,0 +1,64 @@ +import os, shutil, unittest, traceback, sys, time + + +import keepnote.gui +from keepnote import notebook as notebooklib +from keepnote.notebook import update + +import gtk, gobject + + +def mk_clean_dir(dirname): + if os.path.exists(dirname): + shutil.rmtree(dirname) + os.makedirs(dirname) + + + +class TestCaseWaitDialog (unittest.TestCase): + + def setUp(self): + pass + + + def test1(self): + """test notebook update from version 1 to 2""" + + app = keepnote.gui.KeepNote() + app.init() + win = app.new_window() + + start = time.time() + + def func1(task, n=10.0, depth=0): + + if depth == 0: + def func2(): + d = keepnote.gui.dialog_wait.WaitDialog(win) + task2 = keepnote.tasklib.Task(lambda t: func1(t, 5.0, 1)) + d.show("dialog 2", "this is the second dialog", task2) + return False + gobject.idle_add(func2) + elif depth == 1: + print "HERE" + gobject.idle_add(lambda: app.message("Hello", "Hi")) + + t = 0.0 + while t < n and task.is_running(): + task.set_percent(t / n) + t = time.time() - start + + + d = keepnote.gui.dialog_wait.WaitDialog(win) + task1 = keepnote.tasklib.Task(func1) + d.show("dialog 1", "this is the first dialog", task1) + + gtk.main() + + + +if __name__ == "__main__": + unittest.main() + + + diff --git a/tests/data/notebook-v3/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf b/tests/data/notebook-v3/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf index f6d261b70..d07acb10b 100644 Binary files a/tests/data/notebook-v3/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf and b/tests/data/notebook-v3/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf differ diff --git a/tests/data/notebook-v4/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf b/tests/data/notebook-v4/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf index f6d261b70..d07acb10b 100644 Binary files a/tests/data/notebook-v4/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf and b/tests/data/notebook-v4/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf differ diff --git a/tests/data/notebook-v5/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf b/tests/data/notebook-v5/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf index f6d261b70..d07acb10b 100644 Binary files a/tests/data/notebook-v5/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf and b/tests/data/notebook-v5/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf differ diff --git a/tests/data/notebook-v6/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf b/tests/data/notebook-v6/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf index f6d261b70..d07acb10b 100644 Binary files a/tests/data/notebook-v6/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf and b/tests/data/notebook-v6/test for drag and drop/drop pages test/dir1/itr_locations.pdf/itr_locations.pdf differ diff --git a/tests/data/test_extension/__init__.py b/tests/data/test_extension/__init__.py index ba5f43c53..7c5df78ec 100644 --- a/tests/data/test_extension/__init__.py +++ b/tests/data/test_extension/__init__.py @@ -31,7 +31,7 @@ import sys _ = gettext.gettext -# keepnote imports +# keepnote.py imports import keepnote import keepnote.extension import keepnote.gui.extension @@ -63,7 +63,7 @@ def __init__(self, app): self._ui_id = {} def get_depends(self): - return [("keepnote", ">=", (0, 6, 2))] + return [("keepnote.py", ">=", (0, 6, 2))] #================================ # UI setup diff --git a/tests/test_commands.py b/tests/test_commands.py index 7c9c338d2..fee1400be 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -1,6 +1,6 @@ import unittest -# keepnote imports +# keepnote.py imports from keepnote import commands @@ -13,4 +13,4 @@ def test1(self): args = ['a b', 'c d'] args2 = commands.parse_command(commands.format_command(args)) - self.assertEquals(args, args2) + self.assertEqual(args, args2) diff --git a/tests/test_commands.py.bak b/tests/test_commands.py.bak new file mode 100644 index 000000000..7c9c338d2 --- /dev/null +++ b/tests/test_commands.py.bak @@ -0,0 +1,16 @@ +import unittest + +# keepnote imports +from keepnote import commands + + +class Commands (unittest.TestCase): + + def setUp(self): + pass + + def test1(self): + args = ['a b', 'c d'] + args2 = commands.parse_command(commands.format_command(args)) + + self.assertEquals(args, args2) diff --git a/tests/test_extension.py b/tests/test_extension.py index 39704b034..b5ae9a770 100644 --- a/tests/test_extension.py +++ b/tests/test_extension.py @@ -1,7 +1,7 @@ import os import unittest -# keepnote imports +# keepnote.py imports import keepnote from keepnote import extension @@ -12,7 +12,7 @@ _tmppath = os.path.join(TMP_DIR, 'extension') _home = os.path.join(_tmppath, 'home') _extension_file = os.path.join(DATA_DIR, 'test_extension.kne') -_pref_dir = os.path.join(_home, '.config', 'keepnote') +_pref_dir = os.path.join(_home, '.config', 'keepnote.py') class ExtensionInstall (unittest.TestCase): @@ -74,7 +74,7 @@ def test_disabled_extensions(self): # Disable extension. ext = next(ext for ext in app.get_enabled_extensions() - if ext.key != 'keepnote') + if ext.key != 'keepnote.py') ext.enable(False) ext_key = ext.key @@ -102,7 +102,7 @@ def test_install_prog(self): """Extension install using program from command-line.""" clean_dir(_tmppath) os.system( - "HOME=%s bin/keepnote --no-gui -c install '%s'" + "HOME=%s bin/keepnote.py --no-gui -c install '%s'" % (_home, _extension_file)) self.assertTrue(os.path.exists( _pref_dir + '/extensions/test_extension/info.xml')) diff --git a/tests/test_gtk.py b/tests/test_gtk.py new file mode 100644 index 000000000..672eeb702 --- /dev/null +++ b/tests/test_gtk.py @@ -0,0 +1,9 @@ +from gi import require_version +require_version('Gtk', '3.0') + +from gi.repository import Gtk + +window = Gtk.Window(title="你好窗口!!!") +window.connect("destroy", Gtk.main_quit) +window.show_all() +Gtk.main() diff --git a/tests/test_install.py b/tests/test_install.py index 5f3a02f70..f8e951e0c 100644 --- a/tests/test_install.py +++ b/tests/test_install.py @@ -3,7 +3,7 @@ import os import unittest -# keepnote imports +# keepnote.py imports from keepnote import PROGRAM_VERSION_TEXT from . import TMP_DIR, SRC_DIR, make_clean_dir @@ -12,13 +12,13 @@ class Install (unittest.TestCase): def system(self, cmd, err_code=0): - print cmd + print(cmd) self.assertEqual(os.system(cmd), err_code) def test_distutil_sdist(self): """Test distutil install""" - pkg = "keepnote-%s" % PROGRAM_VERSION_TEXT + pkg = "keepnote.py-%s" % PROGRAM_VERSION_TEXT sdist = SRC_DIR + "/dist/%s.tar.gz" % pkg install_dir = TMP_DIR + "/install/distutil" home_dir = TMP_DIR + "/install/home" @@ -38,5 +38,5 @@ def test_distutil_sdist(self): self.system("cp ~/.Xauthority %s" % home_dir) self.system("HOME=%s; PYTHONPATH=%s/lib/python; " - "python %s/bin/keepnote --no-gui" % + "python %s/bin/keepnote.py --no-gui" % (home_dir, install_dir, install_dir)) diff --git a/tests/test_install.py.bak b/tests/test_install.py.bak new file mode 100644 index 000000000..5f3a02f70 --- /dev/null +++ b/tests/test_install.py.bak @@ -0,0 +1,42 @@ + +# python imports +import os +import unittest + +# keepnote imports +from keepnote import PROGRAM_VERSION_TEXT + +from . import TMP_DIR, SRC_DIR, make_clean_dir + + +class Install (unittest.TestCase): + + def system(self, cmd, err_code=0): + print cmd + self.assertEqual(os.system(cmd), err_code) + + def test_distutil_sdist(self): + """Test distutil install""" + + pkg = "keepnote-%s" % PROGRAM_VERSION_TEXT + sdist = SRC_DIR + "/dist/%s.tar.gz" % pkg + install_dir = TMP_DIR + "/install/distutil" + home_dir = TMP_DIR + "/install/home" + + if not os.path.exists(sdist): + raise OSError('Must build install package to test: %s' % sdist) + + make_clean_dir(install_dir) + make_clean_dir(home_dir) + + self.system("tar zxv -C %s -f %s" % (install_dir, sdist)) + + self.system("/usr/bin/python %s/%s/setup.py install --home=%s" % + (install_dir, pkg, install_dir)) + + # To allow gui to run. + self.system("cp ~/.Xauthority %s" % home_dir) + + self.system("HOME=%s; PYTHONPATH=%s/lib/python; " + "python %s/bin/keepnote --no-gui" % + (home_dir, install_dir, install_dir)) diff --git a/tests/test_notebook_conn.py b/tests/test_notebook_conn.py index 2d0106336..ca535ee29 100644 --- a/tests/test_notebook_conn.py +++ b/tests/test_notebook_conn.py @@ -1,10 +1,10 @@ # python imports -from StringIO import StringIO +from io import StringIO import sys import unittest -# keepnote imports +# keepnote.py imports from keepnote import notebook import keepnote.notebook.connection as connlib from keepnote.notebook.connection import FileError @@ -15,7 +15,7 @@ def display_notebook(node, depth=0, out=sys.stdout): - print >>out, " " * depth + node.get_attr("title") + print(" " * depth + node.get_attr("title"), file=out) for child in node.get_children(): display_notebook(child, depth+2, out) diff --git a/tests/test_notebook_conn.py.bak b/tests/test_notebook_conn.py.bak new file mode 100644 index 000000000..2d0106336 --- /dev/null +++ b/tests/test_notebook_conn.py.bak @@ -0,0 +1,330 @@ + +# python imports +from StringIO import StringIO +import sys +import unittest + +# keepnote imports +from keepnote import notebook +import keepnote.notebook.connection as connlib +from keepnote.notebook.connection import FileError + +from . import TMP_DIR + +_tmpdir = TMP_DIR + '/notebook_conn/' + + +def display_notebook(node, depth=0, out=sys.stdout): + print >>out, " " * depth + node.get_attr("title") + for child in node.get_children(): + display_notebook(child, depth+2, out) + + +class TestConnBase (unittest.TestCase): + + def _test_api(self, conn): + self._test_nodes(conn) + self._test_files(conn) + + def _test_nodes(self, conn): + + self._test_create_read_node(conn) + self._test_update_node(conn) + self._test_delete_node(conn) + self._test_unknown_node(conn) + + def _test_create_read_node(self, conn): + + attrs = [ + # Basic types. + { + 'key1': 1, + 'key2': 2.0, + 'key3': '3', + 'key4': True, + 'key5': None, + }, + + # Empty attributes. + {}, + + # Complex attributes. + { + 'a list': [1, 2, 'x'], + 'a dict': { + 'a': 1, + 'bb': 2, + 'cc': 4.0, + }, + }, + ] + + for i, attr in enumerate(attrs): + nodeid = 'create%d' % i + conn.create_node(nodeid, attr) + + # Node should now exist. + self.assertTrue(conn.has_node(nodeid)) + + # Read a node back. It should match the stored data. + attr2 = conn.read_node(nodeid) + self.assertEqual(attr, attr2) + + # Double create should fail. + conn.create_node('double_create', {}) + self.assertRaises(connlib.NodeExists, + lambda: conn.create_node('double_create', {})) + + def _test_update_node(self, conn): + # Create node. + attr = { + 'key1': 1, + 'key2': 2.0, + 'key3': '3', + 'key4': True, + 'key5': None, + } + conn.create_node('node2', attr) + + # Update a node. + attr['key2'] = 5.0 + conn.update_node('node2', attr) + + # Read a node back. It should match the stored data. + attr2 = conn.read_node('node2') + self.assertEqual(attr, attr2) + + def _test_delete_node(self, conn): + # Create node. + attr = { + 'key1': 1, + 'key2': 2.0, + 'key3': '3', + 'key4': True, + 'key5': None, + } + conn.create_node('node3', attr) + self.assertTrue(conn.has_node('node3')) + + # Delete node. + conn.delete_node('node3') + self.assertFalse(conn.has_node('node3')) + self.assertRaises(connlib.UnknownNode, + lambda: conn.read_node('node3')) + + def _test_unknown_node(self, conn): + + self.assertRaises(connlib.UnknownNode, lambda: + conn.read_node('unknown_node')) + self.assertRaises(connlib.UnknownNode, + lambda: conn.update_node('unknown_node', {})) + self.assertRaises(connlib.UnknownNode, + lambda: conn.delete_node('unknown_node')) + + def _test_files(self, conn): + + # Create empty node. + if conn.has_node('node1'): + conn.delete_node('node1') + conn.create_node('node1', {}) + + # Write file. + data = 'hello world' + with conn.open_file('node1', 'file1', 'w') as out: + out.write(data) + + # Read file. + with conn.open_file('node1', 'file1') as infile: + self.assertEqual(infile.read(), data) + + # Write file inside directory. + data2 = 'another hello world' + with conn.open_file('node1', 'dir1/file1', 'w') as out: + out.write(data2) + + # Read file inside a directory. + with conn.open_file('node1', 'dir1/file1') as infile: + self.assertEqual(infile.read(), data2) + + # Delete a file. + conn.delete_file('node1', 'dir1/file1') + self.assertFalse(conn.has_file('node1', 'dir1/file1')) + + # Delete a directory. + self.assertTrue(conn.has_file('node1', 'dir1/')) + conn.delete_file('node1', 'dir1/') + self.assertFalse(conn.has_file('node1', 'dir1/')) + + # Delete a non-empty directory. + conn.open_file('node1', 'dir3/dir/file1', 'w').close() + self.assertTrue(conn.has_file('node1', 'dir3/dir/file1')) + conn.delete_file('node1', 'dir3/') + self.assertFalse(conn.has_file('node1', 'dir3/')) + + # Create a directory. + conn.create_dir('node1', 'new dir/') + + # Require trailing / for directories. + # Do not allow trailing / for files. + self.assertRaises(FileError, lambda: + conn.create_dir('node1', 'bad dir')) + self.assertRaises(FileError, lambda: + conn.open_file('node1', 'bad file/', 'w')) + self.assertRaises(FileError, lambda: + conn.create_dir('node1', 'bad dir')) + self.assertRaises(FileError, lambda: + list(conn.list_dir('node1', 'file1'))) + + # Should not delete file because its given as a dir. + conn.delete_file('node1', 'file1/') + self.assertTrue(conn.has_file('node1', 'file1')) + + # Should not delete dir, becuase its given as a file. + conn.delete_file('node1', 'new dir') + self.assertTrue(conn.has_file('node1', 'new dir/')) + + # Rename file. + conn.move_file('node1', 'file1', 'node1', 'file2') + self.assertFalse(conn.has_file('node1', 'file1')) + self.assertTrue(conn.has_file('node1', 'file2')) + + # Move a file. + if conn.has_node('node2'): + conn.delete_node('node2') + conn.create_node('node2', {}) + conn.move_file('node1', 'file2', 'node2', 'file2') + self.assertFalse(conn.has_file('node1', 'file2')) + self.assertTrue(conn.has_file('node2', 'file2')) + + # Copy a file. + conn.copy_file('node2', 'file2', 'node1', 'copied-file') + self.assertTrue(conn.has_file('node2', 'file2')) + self.assertTrue(conn.has_file('node1', 'copied-file')) + self.assertEqual(conn.open_file('node1', 'copied-file').read(), + data) + + # Ensure files aren't interpreted as children files. + # Create a file that conflicts with a child node directory. + conn.create_node('node3', {}) + data2 = 'another hello world' + conn.create_node('dir2', { + 'nodeid': 'dir2', + 'title': 'dir2', + 'parentids': ['node3']}) + + with conn.open_file('node3', 'dir2/file1', 'w') as out: + out.write(data2) + + with conn.open_file('node3', 'dir2/file1') as infile: + self.assertEqual(infile.read(), data2) + + self.assertTrue(conn.has_file('node3', 'dir2/file1')) + # TODO: fix this bug for FS. + #self.assertFalse(conn.has_file('dir2', 'file1')) + + # listdir should return full file paths. + conn.open_file('node3', 'dir2/file2', 'w').close() + conn.create_dir('node3', 'dir2/dir3/') + conn.open_file('node3', 'dir2/dir3/file1', 'w').close() + self.assertEqual( + set(conn.list_dir('node3', 'dir2/')), + set(['dir2/file1', 'dir2/file2', 'dir2/dir3/'])) + + def _test_notebook(self, conn, filename): + + # initialize a notebook + book1 = notebook.NoteBook() + book1.create(filename, conn) + book1.set_attr("title", "root") + + # populate book + for i in range(5): + node = notebook.new_page(book1, "a%d" % i) + for j in range(2): + notebook.new_page(node, "b%d-%d" % (i, j)) + + expected = """\ +root + a0 + b0-0 + b0-1 + a1 + b1-0 + b1-1 + a2 + b2-0 + b2-1 + a3 + b3-0 + b3-1 + a4 + b4-0 + b4-1 + Trash +""" + # assert structure is correct. + out = StringIO() + display_notebook(book1, out=out) + self.assertEqual(out.getvalue(), expected) + + # edit book + nodeid = book1.search_node_titles("a1")[0][0] + node1 = book1.get_node_by_id(nodeid) + + nodeid = book1.search_node_titles("b3-0")[0][0] + node2 = book1.get_node_by_id(nodeid) + + node1.move(node2) + + expected = """\ +root + a0 + b0-0 + b0-1 + a2 + b2-0 + b2-1 + a3 + b3-0 + a1 + b1-0 + b1-1 + b3-1 + a4 + b4-0 + b4-1 + Trash +""" + + # Assert new structure. + out = StringIO() + display_notebook(book1, out=out) + self.assertEqual(out.getvalue(), expected) + + # Assert that file contents are provided. + self.assertEqual(node1.open_file("page.html").read(), + notebook.BLANK_NOTE) + + +class TestConn (unittest.TestCase): + + def test_basename(self): + + """ + Return the last component of a filename + + aaa/bbb => bbb + aaa/bbb/ => bbb + aaa/ => aaa + aaa => aaa + '' => '' + / => '' + """ + self.assertEqual(connlib.path_basename("aaa/b/ccc"), "ccc") + self.assertEqual(connlib.path_basename("aaa/b/ccc/"), "ccc") + self.assertEqual(connlib.path_basename("aaa/bbb"), "bbb") + self.assertEqual(connlib.path_basename("aaa/bbb/"), "bbb") + self.assertEqual(connlib.path_basename("aaa"), "aaa") + self.assertEqual(connlib.path_basename("aaa/"), "aaa") + self.assertEqual(connlib.path_basename(""), "") + self.assertEqual(connlib.path_basename("/"), "") diff --git a/tests/test_notebook_fs.py b/tests/test_notebook_fs.py index f8d3a626c..fab0917ae 100644 --- a/tests/test_notebook_fs.py +++ b/tests/test_notebook_fs.py @@ -2,7 +2,7 @@ # python imports import os -# keepnote imports +# keepnote.py imports from keepnote.notebook import NOTEBOOK_FORMAT_VERSION import keepnote.notebook.connection as connlib from keepnote.notebook.connection import fs @@ -71,8 +71,8 @@ def test_fs_schema(self): self.assertIn(key, attr) # New root node should have no parents or children. - self.assertEquals(attr['parentids'], []) - self.assertEquals(attr['childrenids'], []) + self.assertEqual(attr['parentids'], []) + self.assertEqual(attr['childrenids'], []) # Updating a node should enforce schema required keys. conn.update_node(nodeid, {}) diff --git a/tests/test_notebook_fs.py.bak b/tests/test_notebook_fs.py.bak new file mode 100644 index 000000000..f8d3a626c --- /dev/null +++ b/tests/test_notebook_fs.py.bak @@ -0,0 +1,199 @@ + +# python imports +import os + +# keepnote imports +from keepnote.notebook import NOTEBOOK_FORMAT_VERSION +import keepnote.notebook.connection as connlib +from keepnote.notebook.connection import fs + +from .test_notebook_conn import TestConnBase +from . import clean_dir +from . import TMP_DIR + +_tmpdir = TMP_DIR + '/notebook_conn/' + + +class TestConnFS (TestConnBase): + + def test_api(self): + """Test NoteBookConnectionFS file API.""" + notebook_file = _tmpdir + '/notebook_files' + clean_dir(notebook_file) + + # Start connection. + conn = fs.BaseNoteBookConnectionFS() + conn.connect(notebook_file) + + # Create root node. + attr = { + # Required attributes. + 'nodeid': 'root', + 'version': NOTEBOOK_FORMAT_VERSION, + 'parentids': [], + 'childrenids': [], + + # Custom attributes. + 'key1': 1, + 'key2': 2.0, + 'key3': '3', + 'key4': True, + 'key5': None, + } + conn.create_node('root', attr) + self._test_api(conn) + + def test_fs_orphan(self): + """Test orphan node directory names""" + self.assertEqual(fs.get_orphandir('path', 'abcdefh'), + 'path/__NOTEBOOK__/orphans/ab/cdefh') + self.assertEqual(fs.get_orphandir('path', 'ab'), + 'path/__NOTEBOOK__/orphans/ab') + self.assertEqual(fs.get_orphandir('path', 'a'), + 'path/__NOTEBOOK__/orphans/a') + + def test_fs_schema(self): + """Test NoteBook-specific schema behavior.""" + notebook_file = _tmpdir + '/notebook_nodes' + clean_dir(notebook_file) + + # Start connection. + conn = fs.NoteBookConnectionFS() + conn.connect(notebook_file) + + # Create root node with no attributes given. + nodeid = conn.create_node(None, {}) + attr = conn.read_node(nodeid) + + # Assert that default keys are added. + expected_keys = ['nodeid', 'parentids', 'childrenids', 'version'] + for key in expected_keys: + self.assertIn(key, attr) + + # New root node should have no parents or children. + self.assertEquals(attr['parentids'], []) + self.assertEquals(attr['childrenids'], []) + + # Updating a node should enforce schema required keys. + conn.update_node(nodeid, {}) + attr2 = conn.read_node(nodeid) + self.assertEqual(attr, attr2) + + def test_fs_nodes(self): + """Test NoteBookConnectionFS node API.""" + notebook_file = _tmpdir + '/notebook_nodes' + clean_dir(notebook_file) + + # Start connection. + conn = fs.NoteBookConnectionFS() + conn.connect(notebook_file) + + # Create root node. + attr = { + # Required attributes. + 'nodeid': 'node1', + 'version': NOTEBOOK_FORMAT_VERSION, + 'parentids': [], + 'childrenids': [], + + # Custom attributes. + 'key1': 1, + 'key2': 2.0, + 'key3': '3', + 'key4': True, + 'key5': None, + } + conn.create_node('node1', attr) + + self.assertTrue( + os.path.exists(notebook_file + '/node.xml')) + self.assertTrue(conn.has_node('node1')) + self.assertEqual(conn.get_rootid(), 'node1') + + # Read a node back. It should match the stored data. + attr2 = conn.read_node('node1') + self.assertEqual(attr, attr2) + + # Update a node. + attr2['key2'] = 5.0 + conn.update_node('node1', attr2) + + # Read a node back. It should match the stored data. + attr3 = conn.read_node('node1') + self.assertEqual(attr2, attr3) + + # Create another node. + attr = { + # Required attributes. + 'nodeid': 'node2', + 'version': NOTEBOOK_FORMAT_VERSION, + 'parentids': [], + + # Custom attributes. + 'key1': 1, + 'key2': 2.0, + 'key3': '3', + 'key4': True, + 'key5': None, + } + conn.create_node('node2', attr) + attr2 = conn.read_node('node2') + self.assertEqual(attr, attr2) + + # Create another node. + attr = { + # Required attributes. + 'nodeid': 'n', + 'version': NOTEBOOK_FORMAT_VERSION, + 'parentids': [], + + # Custom attributes. + 'key1': 1, + 'key2': 2.0, + 'key3': '3', + 'key4': True, + 'key5': None, + } + conn.create_node('n', attr) + attr2 = conn.read_node('n') + self.assertEqual(attr, attr2) + + # Delete node. + conn.delete_node('n') + self.assertFalse(conn.has_node('n')) + self.assertRaises(connlib.UnknownNode, + lambda: conn.read_node('n')) + + # Create child node. + attr = { + # Required attributes. + 'nodeid': 'node1_child', + 'version': NOTEBOOK_FORMAT_VERSION, + 'parentids': ['node1'], + + # Custom attributes. + 'key1': 1, + } + conn.create_node('node1_child', attr) + self.assertTrue( + os.path.exists(notebook_file + '/new page/node.xml')) + + # Create grandchild node. + # Use title to set directory name. + attr = { + # Required attributes. + 'nodeid': 'node1_grandchild', + 'version': NOTEBOOK_FORMAT_VERSION, + 'parentids': ['node1_child'], + 'title': 'Node1 Grandchild', + + # Custom attributes. + 'key1': 1, + } + conn.create_node('node1_grandchild', attr) + self.assertTrue( + os.path.exists(notebook_file + + '/new page/node1 grandchild/node.xml')) + + # Clean up. + conn.close() diff --git a/tests/test_notebook_fs_raw.py b/tests/test_notebook_fs_raw.py index 27a1cd04e..4d49fe397 100644 --- a/tests/test_notebook_fs_raw.py +++ b/tests/test_notebook_fs_raw.py @@ -3,7 +3,7 @@ import os import uuid -# keepnote imports +# keepnote.py imports from keepnote.notebook.connection import fs_raw from .test_notebook_conn import TestConnBase @@ -98,7 +98,7 @@ def test_nodedirs_standard(self): self.assertEqual( set(nodedirs.iter_nodeids()), - set(['abcdefg', u'abcdefghij', u'1234567', + set(['abcdefg', 'abcdefghij', '1234567', 'ab', 'ac', 'a', '...', '....', 'ab.', 'ab..'])) @@ -169,7 +169,7 @@ def test_nodedirs(self): self.assertEqual( set(nodedirs.iter_nodeids()), - set(['abcdefg', u'abcdefghij', u'1234567', + set(['abcdefg', 'abcdefghij', '1234567', 'ab', 'ac', 'a', '...', '....', 'ab.', 'ab..', 'x' * 256, '.', '..', 'ABC', 'abc+', 'abc/aaa'])) @@ -177,7 +177,7 @@ def test_nodedirs(self): nodedirs.delete_nodedir('ABC') self.assertEqual( set(nodedirs.iter_nodeids()), - set(['abcdefg', u'abcdefghij', u'1234567', + set(['abcdefg', 'abcdefghij', '1234567', 'ab', 'ac', 'a', '...', '....', 'ab.', 'ab..', 'x' * 256, '.', '..', 'abc+', 'abc/aaa'])) @@ -197,7 +197,7 @@ def test_no_extra(self): self.assertEqual( set(nodedirs.iter_nodeids()), - set(['abcdefg', u'abcdefghij', u'1234567'])) + set(['abcdefg', 'abcdefghij', '1234567'])) nodedirs.close() @@ -207,7 +207,7 @@ def test_many_nodeids(self): make_clean_dir(filename) nodedirs = fs_raw.NodeFS(filename) - for i in xrange(1000): + for i in range(1000): nodeid = str(uuid.uuid4()) nodedirs.create_nodedir(nodeid) diff --git a/tests/test_notebook_fs_raw.py.bak b/tests/test_notebook_fs_raw.py.bak new file mode 100644 index 000000000..27a1cd04e --- /dev/null +++ b/tests/test_notebook_fs_raw.py.bak @@ -0,0 +1,214 @@ + +# python imports +import os +import uuid + +# keepnote imports +from keepnote.notebook.connection import fs_raw + +from .test_notebook_conn import TestConnBase +from . import make_clean_dir, TMP_DIR + + +class FSRaw (TestConnBase): + + def test_api(self): + # initialize a notebook + filename = TMP_DIR + '/notebook_fs_raw/n1' + make_clean_dir(TMP_DIR + '/notebook_fs_raw') + + conn = fs_raw.NoteBookConnectionFSRaw() + conn.connect(filename) + self._test_api(conn) + + conn.close() + + def test_notebook(self): + # initialize a notebook + filename = TMP_DIR + '/notebook_fs_raw/n2' + make_clean_dir(TMP_DIR + '/notebook_fs_raw') + + conn = fs_raw.NoteBookConnectionFSRaw() + self._test_notebook(conn, filename) + + conn.close() + + def test_nodedirs_standard(self): + """Basic NodeFSStandard API.""" + + filename = TMP_DIR + '/notebook_fs_raw/nodedirs_standard' + make_clean_dir(filename) + + nodedirs = fs_raw.NodeFSStandard(filename) + + # Create nodedirs. + dir1 = nodedirs.create_nodedir('abcdefg') + dir2 = nodedirs.create_nodedir('abcdefghij') + dir3 = nodedirs.create_nodedir('1234567') + dir4 = nodedirs.create_nodedir('1234568') + + self.assertTrue(os.path.exists(dir1)) + self.assertTrue(os.path.exists(dir2)) + self.assertTrue(os.path.exists(dir3)) + self.assertTrue(os.path.exists(dir4)) + + # Test existence of nodedirs. + self.assertTrue(nodedirs.has_nodedir('abcdefg')) + self.assertFalse(nodedirs.has_nodedir('abcdefg_unknown')) + + # Delete nodedirs. + nodedirs.delete_nodedir('1234568') + self.assertFalse(os.path.exists(dir4)) + + # Test short nodeids. + dir_short = nodedirs.create_nodedir('ab') + self.assertTrue(os.path.exists(dir_short)) + self.assertTrue(nodedirs.has_nodedir('ab')) + nodedirs.delete_nodedir('ab') + self.assertFalse(os.path.exists(dir_short)) + + nodedirs.create_nodedir('ab') + nodedirs.create_nodedir('ac') + nodedirs.create_nodedir('a') + + # Test invalid nodeid lengths. + self.assertRaises(Exception, lambda: nodedirs.create_nodedir('')) + self.assertRaises( + Exception, lambda: nodedirs.create_nodedir('x' * 256)) + + # Test banned nodeids. + self.assertRaises(Exception, lambda: nodedirs.create_nodedir('.')) + self.assertRaises(Exception, lambda: nodedirs.create_nodedir('..')) + + # Test invalid characters. + self.assertRaises(Exception, lambda: nodedirs.create_nodedir('ABC')) + self.assertRaises(Exception, lambda: nodedirs.create_nodedir('abc+')) + self.assertRaises(Exception, lambda: + nodedirs.create_nodedir('abc/aaa')) + + # Create nodedirs with dots. + nodedirs.create_nodedir('...') + nodedirs.create_nodedir('....') + nodedirs.create_nodedir('ab.') + nodedirs.create_nodedir('ab..') + + self.assertTrue(nodedirs.has_nodedir('ab.')) + self.assertTrue(nodedirs.has_nodedir('ab..')) + self.assertFalse(nodedirs.has_nodedir('ac.')) + + self.assertEqual( + set(nodedirs.iter_nodeids()), + set(['abcdefg', u'abcdefghij', u'1234567', + 'ab', 'ac', 'a', + '...', '....', 'ab.', 'ab..'])) + + nodedirs.close() + + def test_nodedirs(self): + """Basic NodeFS API.""" + + filename = TMP_DIR + '/notebook_fs_raw/nodedirs' + make_clean_dir(filename) + + nodedirs = fs_raw.NodeFS(filename) + + # Create nodedirs. + dir1 = nodedirs.create_nodedir('abcdefg') + dir2 = nodedirs.create_nodedir('abcdefghij') + dir3 = nodedirs.create_nodedir('1234567') + dir4 = nodedirs.create_nodedir('1234568') + + self.assertTrue(os.path.exists(dir1)) + self.assertTrue(os.path.exists(dir2)) + self.assertTrue(os.path.exists(dir3)) + self.assertTrue(os.path.exists(dir4)) + + # Test existence of nodedirs. + self.assertTrue(nodedirs.has_nodedir('abcdefg')) + self.assertFalse(nodedirs.has_nodedir('abcdefg_unknown')) + + # Delete nodedirs. + nodedirs.delete_nodedir('1234568') + self.assertFalse(os.path.exists(dir4)) + + # Test short nodeids. + dir_short = nodedirs.create_nodedir('ab') + self.assertTrue(os.path.exists(dir_short)) + self.assertTrue(nodedirs.has_nodedir('ab')) + nodedirs.delete_nodedir('ab') + self.assertFalse(os.path.exists(dir_short)) + + nodedirs.create_nodedir('ab') + nodedirs.create_nodedir('ac') + nodedirs.create_nodedir('a') + + # Test invalid nodeid lengths. + self.assertRaises(Exception, lambda: nodedirs.create_nodedir('')) + + # Test nonstandard nodeids. + nodedirs.create_nodedir('x' * 256) + nodedirs.create_nodedir('.') + nodedirs.create_nodedir('..') + nodedirs.create_nodedir('ABC') + nodedirs.create_nodedir('abc+') + nodedirs.create_nodedir('abc/aaa') + + self.assertTrue(nodedirs.has_nodedir('ABC')) + self.assertTrue(nodedirs.has_nodedir('abc+')) + self.assertTrue(nodedirs.has_nodedir('abc/aaa')) + + # Create nodedirs with dots. + nodedirs.create_nodedir('...') + nodedirs.create_nodedir('....') + nodedirs.create_nodedir('ab.') + nodedirs.create_nodedir('ab..') + + self.assertTrue(nodedirs.has_nodedir('ab.')) + self.assertTrue(nodedirs.has_nodedir('ab..')) + self.assertFalse(nodedirs.has_nodedir('ac.')) + + self.assertEqual( + set(nodedirs.iter_nodeids()), + set(['abcdefg', u'abcdefghij', u'1234567', + 'ab', 'ac', 'a', + '...', '....', 'ab.', 'ab..', + 'x' * 256, '.', '..', 'ABC', 'abc+', 'abc/aaa'])) + + nodedirs.delete_nodedir('ABC') + self.assertEqual( + set(nodedirs.iter_nodeids()), + set(['abcdefg', u'abcdefghij', u'1234567', + 'ab', 'ac', 'a', + '...', '....', 'ab.', 'ab..', + 'x' * 256, '.', '..', 'abc+', 'abc/aaa'])) + + nodedirs.close() + + def test_no_extra(self): + """Ensure nodeid iteration occurs even when no small nodids exists.""" + + filename = TMP_DIR + '/notebook_fs_raw/nodedirs_no_extra' + make_clean_dir(filename) + + nodedirs = fs_raw.NodeFS(filename) + nodedirs.create_nodedir('abcdefg') + nodedirs.create_nodedir('abcdefghij') + nodedirs.create_nodedir('1234567') + + self.assertEqual( + set(nodedirs.iter_nodeids()), + set(['abcdefg', u'abcdefghij', u'1234567'])) + + nodedirs.close() + + def test_many_nodeids(self): + + filename = TMP_DIR + '/notebook_fs_raw/nodedirs_many' + make_clean_dir(filename) + + nodedirs = fs_raw.NodeFS(filename) + for i in xrange(1000): + nodeid = str(uuid.uuid4()) + nodedirs.create_nodedir(nodeid) + + nodedirs.close() diff --git a/tests/test_notebook_heal.py b/tests/test_notebook_heal.py index b113afc6b..6357e0b6d 100644 --- a/tests/test_notebook_heal.py +++ b/tests/test_notebook_heal.py @@ -4,7 +4,7 @@ import os import time -# keepnote imports +# keepnote.py imports from keepnote import notebook import keepnote.notebook.connection.fs as fs from keepnote.notebook.connection import ConnectionError @@ -114,13 +114,13 @@ def make_notebook(node, children): # initialize a notebook make_clean_dir(_tmpdir + "/notebook_tamper") - print "creating notebook" + print("creating notebook") book = notebook.NoteBook() book.create(_tmpdir + "/notebook_tamper/n1") make_notebook(book, struct) book.close() - print "system" + print("system") os.system(( "sqlite3 %s/notebook_tamper/n1/__NOTEBOOK__/index.sqlite " "'select mtime from NodeGraph where parentid == \"" + @@ -128,16 +128,16 @@ def make_notebook(node, children): time.sleep(1) - print fs.get_path_mtime(_tmpdir + u"/notebook_tamper/n1") - fs.mark_path_outdated(_tmpdir + u"/notebook_tamper/n1") - print fs.get_path_mtime(_tmpdir + u"/notebook_tamper/n1") + print(fs.get_path_mtime(_tmpdir + "/notebook_tamper/n1")) + fs.mark_path_outdated(_tmpdir + "/notebook_tamper/n1") + print(fs.get_path_mtime(_tmpdir + "/notebook_tamper/n1")) - print "reopening notebook 1" + print("reopening notebook 1") book = notebook.NoteBook() book.load(_tmpdir + "/notebook_tamper/n1") book.close() - print "reopening notebook 2" + print("reopening notebook 2") book = notebook.NoteBook() book.load(_tmpdir + "/notebook_tamper/n1") book.close() diff --git a/tests/test_notebook_heal.py.bak b/tests/test_notebook_heal.py.bak new file mode 100644 index 000000000..b113afc6b --- /dev/null +++ b/tests/test_notebook_heal.py.bak @@ -0,0 +1,143 @@ + +# python imports +import unittest +import os +import time + +# keepnote imports +from keepnote import notebook +import keepnote.notebook.connection.fs as fs +from keepnote.notebook.connection import ConnectionError + +from . import make_clean_dir, TMP_DIR + +_tmpdir = os.path.join(TMP_DIR, 'notebook_heal') + + +class Heal (unittest.TestCase): + + def test_no_index(self): + + # initialize two notebooks + make_clean_dir(_tmpdir) + + book = notebook.NoteBook() + book.create(_tmpdir + "/n1") + book.close() + + # remove index + os.remove(_tmpdir + "/n1/__NOTEBOOK__/index.sqlite") + + # try to load again + book = notebook.NoteBook() + book.load(_tmpdir + "/n1") + self.assertTrue("index.sqlite" in os.listdir( + _tmpdir + "/n1/__NOTEBOOK__")) + book.close() + + def test_bad_index(self): + + # initialize two notebooks + make_clean_dir(_tmpdir) + + book = notebook.NoteBook() + book.create(_tmpdir + "/n1") + book.close() + + # corrupt index + out = open(_tmpdir + "/n1/__NOTEBOOK__/index.sqlite", "w") + out.write("jsakhdfjhdsfh") + out.close() + + # try to load again + book = notebook.NoteBook() + book.load(_tmpdir + "/n1") + + self.assertFalse(book._conn._index.is_corrupt()) + self.assertTrue(book.index_needed()) + + book.close() + + def test_bad_node(self): + + # initialize two notebooks + make_clean_dir(_tmpdir) + + book = notebook.NoteBook() + book.create(_tmpdir + "/n1") + book.close() + + # corrupt node + out = open(_tmpdir + "/n1/node.xml", "w") + out.write("***bad node***") + out.close() + + # try to load again, should raise error. + def func(): + book = notebook.NoteBook() + book.load(_tmpdir + "/n1") + + self.assertRaises(ConnectionError, func) + + def test_bad_notebook_pref(self): + + # initialize two notebooks + make_clean_dir(_tmpdir) + + book = notebook.NoteBook() + book.create(_tmpdir + "/n1") + book.close() + + # corrupt preference data + out = open(_tmpdir + "/n1/notebook.nbk", "w") + out.write("***bad preference***") + out.close() + + # try to load again + def func(): + book = notebook.NoteBook() + book.load(_tmpdir + "/n1") + self.assertRaises(notebook.NoteBookError, func) + + def test_tamper(self): + + struct = [["a", ["a1"], ["a2"], ["a3"]], + ["b", ["b1"], ["b2", + ["c1"], ["c2"]]]] + + def make_notebook(node, children): + for child in children: + name = child[0] + node2 = notebook.new_page(node, name) + make_notebook(node2, child[1:]) + + # initialize a notebook + make_clean_dir(_tmpdir + "/notebook_tamper") + + print "creating notebook" + book = notebook.NoteBook() + book.create(_tmpdir + "/notebook_tamper/n1") + make_notebook(book, struct) + book.close() + + print "system" + os.system(( + "sqlite3 %s/notebook_tamper/n1/__NOTEBOOK__/index.sqlite " + "'select mtime from NodeGraph where parentid == \"" + + notebook.UNIVERSAL_ROOT + "\";'") % _tmpdir) + + time.sleep(1) + + print fs.get_path_mtime(_tmpdir + u"/notebook_tamper/n1") + fs.mark_path_outdated(_tmpdir + u"/notebook_tamper/n1") + print fs.get_path_mtime(_tmpdir + u"/notebook_tamper/n1") + + print "reopening notebook 1" + book = notebook.NoteBook() + book.load(_tmpdir + "/notebook_tamper/n1") + book.close() + + print "reopening notebook 2" + book = notebook.NoteBook() + book.load(_tmpdir + "/notebook_tamper/n1") + book.close() diff --git a/tests/test_notebook_http.py b/tests/test_notebook_http.py index 31d9b0554..4353d42be 100644 --- a/tests/test_notebook_http.py +++ b/tests/test_notebook_http.py @@ -1,7 +1,7 @@ import json import socket -import thread -import urllib +import _thread +import urllib.request, urllib.parse, urllib.error from keepnote import notebook as notebooklib from keepnote.notebook.connection.http import NoteBookConnectionHttp @@ -37,7 +37,7 @@ def test_api(self): self.port = 8123 url = "http://%s:%d/notebook/" % (host, self.port) server = BaseNoteBookHttpServer(self.conn, port=self.port) - thread.start_new_thread(server.serve_forever, ()) + _thread.start_new_thread(server.serve_forever, ()) # Connect to server. self.conn2 = NoteBookConnectionHttp() @@ -67,7 +67,7 @@ def test_notebook_schema(self): self.port = 8124 url = "http://%s:%d/notebook/" % (host, self.port) server = NoteBookHttpServer(self.conn, port=self.port) - thread.start_new_thread(server.serve_forever, ()) + _thread.start_new_thread(server.serve_forever, ()) # Connect to server. self.conn2 = NoteBookConnectionHttp() @@ -79,9 +79,9 @@ def test_notebook_schema(self): "key1": 123, "key2": 456, } - data = urllib.urlopen(url + 'nodes/', json.dumps(attr)).read() + data = urllib.request.urlopen(url + 'nodes/', json.dumps(attr)).read() nodeid = json.loads(data)['nodeid'] - data = urllib.urlopen(url + 'nodes/%s' % nodeid).read() + data = urllib.request.urlopen(url + 'nodes/%s' % nodeid).read() attr2 = json.loads(data) attr['nodeid'] = nodeid self.assertEqual(attr, attr2) diff --git a/tests/test_notebook_http.py.bak b/tests/test_notebook_http.py.bak new file mode 100644 index 000000000..31d9b0554 --- /dev/null +++ b/tests/test_notebook_http.py.bak @@ -0,0 +1,90 @@ +import json +import socket +import thread +import urllib + +from keepnote import notebook as notebooklib +from keepnote.notebook.connection.http import NoteBookConnectionHttp +from keepnote.notebook.connection import mem +from keepnote.server import BaseNoteBookHttpServer +from keepnote.server import NoteBookHttpServer + +from .test_notebook_conn import TestConnBase + + +class TestHttp(TestConnBase): + + def wait_for_server(self, conn): + """ + Wait for server to start. + """ + while True: + try: + conn.get_rootid() + break + except socket.error: + # Try again. + pass + + def test_api(self): + # Make pure memory notebook. + self.conn = mem.NoteBookConnectionMem() + self.notebook = notebooklib.NoteBook() + self.notebook.create('', self.conn) + + # Start server in another thread + host = "localhost" + self.port = 8123 + url = "http://%s:%d/notebook/" % (host, self.port) + server = BaseNoteBookHttpServer(self.conn, port=self.port) + thread.start_new_thread(server.serve_forever, ()) + + # Connect to server. + self.conn2 = NoteBookConnectionHttp() + self.conn2.connect(url) + self.wait_for_server(self.conn2) + + # Test full notebook API. + self._test_api(self.conn2) + + self.conn2.close() + self.conn.close() + + # Close server. + server.shutdown() + + def test_notebook_schema(self): + """ + Full HTTP Notebook should enfore schema with nodeid usage. + """ + # Make pure memory notebook. + self.conn = mem.NoteBookConnectionMem() + self.notebook = notebooklib.NoteBook() + self.notebook.create('', self.conn) + + # Start server in another thread + host = "localhost" + self.port = 8124 + url = "http://%s:%d/notebook/" % (host, self.port) + server = NoteBookHttpServer(self.conn, port=self.port) + thread.start_new_thread(server.serve_forever, ()) + + # Connect to server. + self.conn2 = NoteBookConnectionHttp() + self.conn2.connect(url) + self.wait_for_server(self.conn2) + + # Test new node without specifying nodeid. + attr = { + "key1": 123, + "key2": 456, + } + data = urllib.urlopen(url + 'nodes/', json.dumps(attr)).read() + nodeid = json.loads(data)['nodeid'] + data = urllib.urlopen(url + 'nodes/%s' % nodeid).read() + attr2 = json.loads(data) + attr['nodeid'] = nodeid + self.assertEqual(attr, attr2) + + # Close server. + server.shutdown() diff --git a/tests/test_notebook_icons.py b/tests/test_notebook_icons.py index f048c015f..2d32b89bb 100644 --- a/tests/test_notebook_icons.py +++ b/tests/test_notebook_icons.py @@ -2,7 +2,7 @@ import shutil import unittest -# keepnote imports +# keepnote.py imports from keepnote import notebook from . import make_clean_dir @@ -55,11 +55,11 @@ def test_install_icon(self): book.install_icon("share/icons/gnome/16x16/mimetypes/zip.png") book.install_icons( - "keepnote/images/node_icons/folder-orange.png", - "keepnote/images/node_icons/folder-orange-open.png") + "keepnote.py/images/node_icons/folder-orange.png", + "keepnote.py/images/node_icons/folder-orange-open.png") book.install_icons( - "keepnote/images/node_icons/folder-orange.png", - "keepnote/images/node_icons/folder-orange-open.png") + "keepnote.py/images/node_icons/folder-orange.png", + "keepnote.py/images/node_icons/folder-orange-open.png") book.save() diff --git a/tests/test_notebook_index.py b/tests/test_notebook_index.py index 2d6e369d1..e064116c0 100644 --- a/tests/test_notebook_index.py +++ b/tests/test_notebook_index.py @@ -2,14 +2,14 @@ import os import unittest -from StringIO import StringIO +from io import StringIO import sqlite3 as sqlite import sys import threading import time import traceback -# keepnote imports +# keepnote.py imports from keepnote import notebook from . import clean_dir, TMP_DIR @@ -143,7 +143,7 @@ def test_index_all(self): book.load(_notebook_file) for node in book.index_all(): - print node + print(node) book.close() @@ -198,13 +198,13 @@ def test_notebook_threads2(self): test = self error = [False] - print + print() book = notebook.NoteBook() book.load(_notebook_file) def process(book, name): for i in range(100): - print i, name + print(i, name) results = list(book.search_node_contents('world')) test.assertTrue(len(results) == 2) time.sleep(.001) @@ -213,7 +213,7 @@ class Task (threading.Thread): def run(self): try: process(book, 'B') - except Exception, e: + except Exception as e: error[0] = True traceback.print_exception(type(e), e, sys.exc_info()[2]) raise e @@ -235,8 +235,8 @@ def _test_concurrent(self): book2 = notebook.NoteBook() book2.load(_notebook_file) - print list(book1.iter_attr()) - print list(book2.iter_attr()) + print(list(book1.iter_attr())) + print(list(book2.iter_attr())) book1.close() book2.close() @@ -245,7 +245,7 @@ def test_create_unicode_node(self): """Create a node with a unicode title.""" book = notebook.NoteBook() book.load(_notebook_file) - notebook.new_page(book, u'Déjà vu') + notebook.new_page(book, 'Déjà vu') book.close() def test_notebook_move_deja_vu(self): @@ -253,7 +253,7 @@ def test_notebook_move_deja_vu(self): book = notebook.NoteBook() book.load(_notebook_file) - deja = notebook.new_page(book, u'Déjà vu again') + deja = notebook.new_page(book, 'Déjà vu again') nodex = book.get_node_by_id(self._pagex_nodeid) deja.move(nodex) diff --git a/tests/test_notebook_index.py.bak b/tests/test_notebook_index.py.bak new file mode 100644 index 000000000..2d6e369d1 --- /dev/null +++ b/tests/test_notebook_index.py.bak @@ -0,0 +1,263 @@ +# -*- coding: utf-8 -*- + +import os +import unittest +from StringIO import StringIO +import sqlite3 as sqlite +import sys +import threading +import time +import traceback + +# keepnote imports +from keepnote import notebook + +from . import clean_dir, TMP_DIR + + +# test notebook +_notebook_file = os.path.join(TMP_DIR, "notebook") + + +def write_content(page, text): + with page.open_file(notebook.PAGE_DATA_FILE, 'w') as out: + out.write(notebook.NOTE_HEADER) + out.write(text) + out.write(notebook.NOTE_FOOTER) + + # Trigger re-indexing of full text. + page.save(True) + + +class Index (unittest.TestCase): + + @classmethod + def setUpClass(cls): + + # Create a simple notebook to test against. + clean_dir(_notebook_file) + cls._notebook = book = notebook.NoteBook() + book.create(_notebook_file) + + # create simple nodes + page1 = notebook.new_page(book, 'Page 1') + pagea = notebook.new_page(page1, 'Page A') + write_content(pagea, 'hello world') + pageb = notebook.new_page(page1, 'Page B') + write_content(pageb, 'why hello, what is new?') + pagec = notebook.new_page(page1, 'Page C') + write_content(pagec, 'brand new world') + + pagex = notebook.new_page(pageb, 'Page X') + cls._pagex_nodeid = pagex.get_attr('nodeid') + + notebook.new_page(book, 'Page 2') + + notebook.new_page(book, 'Page 3') + book.close() + + @classmethod + def tearDownClass(cls): + pass + + def test_read_data_as_plain_text(self): + infile = StringIO( + '\n' + 'hello there
\n' + 'how are you\n' + '') + expected = ['\n', 'hello there\n', 'how are you\n', ''] + self.assertEqual(list(notebook.read_data_as_plain_text(infile)), + expected) + + # on same line as text + infile = StringIO( + '\n' + 'hello there
\n' + 'how are you') + expected = ['\n', 'hello there\n', 'how are you'] + self.assertEqual(list(notebook.read_data_as_plain_text(infile)), + expected) + + # on same line as text + infile = StringIO( + 'hello there
\n' + 'how are you\n' + '') + expected = ['hello there\n', 'how are you\n', ''] + self.assertEqual(list(notebook.read_data_as_plain_text(infile)), + expected) + + # and on same line as text + infile = StringIO( + 'hello there') + expected = ['hello there'] + self.assertEqual(list(notebook.read_data_as_plain_text(infile)), + expected) + + def test_node_url(self): + """Node URL API.""" + self.assertTrue(notebook.is_node_url( + "nbk:///0841d4cc-2605-4fbb-9b3a-db5d4aeed7a6")) + self.assertFalse( + notebook.is_node_url("nbk://bad_url")) + self.assertFalse(notebook.is_node_url( + "http:///0841d4cc-2605-4fbb-9b3a-db5d4aeed7a6")) + + host, nodeid = notebook.parse_node_url( + "nbk:///0841d4cc-2605-4fbb-9b3a-db5d4aeed7a6") + self.assertEqual(host, "") + self.assertEqual(nodeid, "0841d4cc-2605-4fbb-9b3a-db5d4aeed7a6") + + host, nodeid = notebook.parse_node_url( + "nbk://host/0841d4cc-2605-4fbb-9b3a-db5d4aeed7a6") + self.assertEqual(host, "host") + self.assertEqual(nodeid, "0841d4cc-2605-4fbb-9b3a-db5d4aeed7a6") + + def test_get_node_by_id(self): + """Get a Node by its nodeid.""" + book = notebook.NoteBook() + book.load(_notebook_file) + + node = book.get_node_by_id(self._pagex_nodeid) + self.assertEqual(node.get_title(), 'Page X') + book.close() + + def test_notebook_search_titles(self): + """Search notebook titles.""" + book = notebook.NoteBook() + book.load(_notebook_file) + + results = book.search_node_titles("Page X") + self.assertTrue(self._pagex_nodeid in + (nodeid for nodeid, title in results)) + + results = book.search_node_titles("Page") + self.assertTrue(len(results) >= 7) + + book.close() + + def test_index_all(self): + """Reindex all nodes in notebook.""" + book = notebook.NoteBook() + book.load(_notebook_file) + + for node in book.index_all(): + print node + + book.close() + + def test_fts3(self): + """Ensure full-text search is available.""" + con = sqlite.connect(":memory:") + con.execute("CREATE VIRTUAL TABLE email USING fts3(content TEXT);") + + con.execute("INSERT INTO email VALUES ('hello there how are you');") + con.execute("INSERT INTO email VALUES ('this is tastier');") + + self.assertTrue(len(list( + con.execute("SELECT * FROM email WHERE content MATCH 'tast*';")))) + + def test_fulltext(self): + """Full-text search notebook.""" + book = notebook.NoteBook() + book.load(_notebook_file) + + results = list(book.search_node_contents('hello')) + self.assertTrue(len(results) == 2) + + results = list(book.search_node_contents('world')) + self.assertTrue(len(results) == 2) + + book.close() + + def test_notebook_threads(self): + """Access a notebook in another thread""" + test = self + + book = notebook.NoteBook() + book.load(_notebook_file) + + class Task (threading.Thread): + def run(self): + try: + results = list(book.search_node_contents('world')) + test.assertTrue(len(results) == 2) + except Exception as e: + traceback.print_exception(*sys.exc_info()) + raise e + + task = Task() + task.start() + task.join() + + book.close() + + def test_notebook_threads2(self): + """""" + test = self + error = [False] + + print + book = notebook.NoteBook() + book.load(_notebook_file) + + def process(book, name): + for i in range(100): + print i, name + results = list(book.search_node_contents('world')) + test.assertTrue(len(results) == 2) + time.sleep(.001) + + class Task (threading.Thread): + def run(self): + try: + process(book, 'B') + except Exception, e: + error[0] = True + traceback.print_exception(type(e), e, sys.exc_info()[2]) + raise e + + task = Task() + task.start() + process(book, 'A') + task.join() + + book.close() + + self.assertFalse(error[0]) + + def _test_concurrent(self): + """Open a notebook twice.""" + book1 = notebook.NoteBook() + book1.load(_notebook_file) + + book2 = notebook.NoteBook() + book2.load(_notebook_file) + + print list(book1.iter_attr()) + print list(book2.iter_attr()) + + book1.close() + book2.close() + + def test_create_unicode_node(self): + """Create a node with a unicode title.""" + book = notebook.NoteBook() + book.load(_notebook_file) + notebook.new_page(book, u'Déjà vu') + book.close() + + def test_notebook_move_deja_vu(self): + """Move a unicode titled node.""" + book = notebook.NoteBook() + book.load(_notebook_file) + + deja = notebook.new_page(book, u'Déjà vu again') + nodex = book.get_node_by_id(self._pagex_nodeid) + deja.move(nodex) + + # clean up. + deja.delete() + + book.close() diff --git a/tests/test_notebook_mem.py b/tests/test_notebook_mem.py index f991e5b09..f8f1a247d 100644 --- a/tests/test_notebook_mem.py +++ b/tests/test_notebook_mem.py @@ -1,5 +1,5 @@ -# keepnote imports +# keepnote.py imports from keepnote.notebook.connection import mem from .test_notebook_conn import TestConnBase diff --git a/tests/test_notebook_struct.py b/tests/test_notebook_struct.py index 18030f655..a0fd4751a 100644 --- a/tests/test_notebook_struct.py +++ b/tests/test_notebook_struct.py @@ -3,7 +3,7 @@ import unittest import os -# keepnote imports +# keepnote.py imports from keepnote import notebook import keepnote.notebook.connection.fs as fs from keepnote.notebook import new_nodeid @@ -16,8 +16,8 @@ def display_notebook(node, depth=0): - print " " * depth, - print node.get_title() + print(" " * depth, end=' ') + print(node.get_title()) for child in node.get_children(): display_notebook(child, depth+1) @@ -41,7 +41,7 @@ def test_move(self): # initialize a notebook make_clean_dir(_datapath) - print "creating notebook" + print("creating notebook") book = notebook.NoteBook() book.create(_datapath + "/n1") make_notebook(book, struct) @@ -51,7 +51,7 @@ def test_move(self): book.close() - print "load" + print("load") book = notebook.NoteBook() book.load(_datapath + "/n1") @@ -71,7 +71,7 @@ def test_rename(self): # initialize a notebook make_clean_dir(_datapath) - print "creating notebook" + print("creating notebook") book = notebook.NoteBook() book.create(_datapath + "/n1") make_notebook(book, struct) @@ -81,7 +81,7 @@ def test_rename(self): book.close() - print "load" + print("load") book = notebook.NoteBook() book.load(_datapath + "/n1") display_notebook(book) @@ -96,7 +96,7 @@ def test_random_access(self): # initialize a notebook make_clean_dir(_datapath) - print "creating notebook" + print("creating notebook") book = notebook.NoteBook() book.create(_datapath + "/n1") make_notebook(book, struct) @@ -106,12 +106,12 @@ def test_random_access(self): book.close() - print "load" + print("load") book = notebook.NoteBook() book.load(_datapath + "/n1") c1 = book.get_node_by_id(c1id) - print "found", c1.get_title() + print("found", c1.get_title()) book.close() @@ -136,7 +136,7 @@ def test_orphans(self): conn.create_node(nodeid, {"nodeid": nodeid, "aaa": 3.4}) attr = conn.read_node(nodeid) - print attr + print(attr) # check orphan node dir assert os.path.exists( @@ -147,16 +147,16 @@ def test_orphans(self): attr["aaa"] = 0 conn.update_node(nodeid, attr) attr = conn.read_node(nodeid) - print attr + print(attr) # check orphan node dir - print open(_datapath + "/conn/__NOTEBOOK__/orphans/%s/%s/node.xml" - % (nodeid[:2], nodeid[2:])).read() + print(open(_datapath + "/conn/__NOTEBOOK__/orphans/%s/%s/node.xml" + % (nodeid[:2], nodeid[2:])).read()) # move orphan out of orphandir attr["parentids"] = [rootid] conn.update_node(nodeid, attr) - print conn.read_node(nodeid) + print(conn.read_node(nodeid)) # check orphan node dir is gone assert not os.path.exists( @@ -166,7 +166,7 @@ def test_orphans(self): # move node into orphandir attr["parentids"] = [] conn.update_node(nodeid, attr) - print conn.read_node(nodeid) + print(conn.read_node(nodeid)) # check orphan node dir is gone self.assertTrue(os.path.exists( diff --git a/tests/test_notebook_struct.py.bak b/tests/test_notebook_struct.py.bak new file mode 100644 index 000000000..18030f655 --- /dev/null +++ b/tests/test_notebook_struct.py.bak @@ -0,0 +1,174 @@ + +# python imports +import unittest +import os + +# keepnote imports +from keepnote import notebook +import keepnote.notebook.connection.fs as fs +from keepnote.notebook import new_nodeid + +from . import make_clean_dir, clean_dir, TMP_DIR + + +# root path for test data +_datapath = os.path.join(TMP_DIR, 'notebook_struct') + + +def display_notebook(node, depth=0): + print " " * depth, + print node.get_title() + + for child in node.get_children(): + display_notebook(child, depth+1) + + +def make_notebook(node, children): + for child in children: + name = child[0] + node2 = notebook.new_page(node, name) + make_notebook(node2, child[1:]) + + +class Test (unittest.TestCase): + + def test_move(self): + + struct = [["a", ["a1"], ["a2"], ["a3"]], + ["b", ["b1"], ["b2", + ["c1"], ["c2"]]]] + + # initialize a notebook + make_clean_dir(_datapath) + + print "creating notebook" + book = notebook.NoteBook() + book.create(_datapath + "/n1") + make_notebook(book, struct) + + self.assertTrue( + book.get_children()[1].get_children()[1].get_children()[0]) + + book.close() + + print "load" + book = notebook.NoteBook() + book.load(_datapath + "/n1") + + a2 = book.get_children()[0].get_children()[1] + b = book.get_children()[1] + a2.move(b) + + display_notebook(book) + book.close() + + def test_rename(self): + + struct = [["a", ["a1"], ["a2"], ["a3"]], + ["b", ["b1"], ["b2", + ["c1"], ["c2"]]]] + + # initialize a notebook + make_clean_dir(_datapath) + + print "creating notebook" + book = notebook.NoteBook() + book.create(_datapath + "/n1") + make_notebook(book, struct) + + c1 = book.get_children()[1].get_children()[1].get_children()[0] + c1.rename("new c1") + + book.close() + + print "load" + book = notebook.NoteBook() + book.load(_datapath + "/n1") + display_notebook(book) + book.close() + + def test_random_access(self): + + struct = [["a", ["a1"], ["a2"], ["a3"]], + ["b", ["b1"], ["b2", + ["c1"], ["c2"]]]] + + # initialize a notebook + make_clean_dir(_datapath) + + print "creating notebook" + book = notebook.NoteBook() + book.create(_datapath + "/n1") + make_notebook(book, struct) + + c1id = (book.get_children()[1] + .get_children()[1].get_children()[0].get_attr("nodeid")) + + book.close() + + print "load" + book = notebook.NoteBook() + book.load(_datapath + "/n1") + + c1 = book.get_node_by_id(c1id) + print "found", c1.get_title() + + book.close() + + def test_orphans(self): + + clean_dir(_datapath + "/conn") + + # create new notebook + conn = fs.NoteBookConnectionFS() + conn.connect(_datapath + "/conn") + rootid = new_nodeid() + conn.create_node(rootid, {"nodeid": rootid, + "parentids": [], + "key": 12}) + + # check orphan dir + self.assertTrue( + os.path.exists(_datapath + "/conn/__NOTEBOOK__/orphans")) + + # make orphan + nodeid = new_nodeid() + conn.create_node(nodeid, {"nodeid": nodeid, + "aaa": 3.4}) + attr = conn.read_node(nodeid) + print attr + + # check orphan node dir + assert os.path.exists( + _datapath + "/conn/__NOTEBOOK__/orphans/%s/%s" + % (nodeid[:2], nodeid[2:])) + + # update orphan + attr["aaa"] = 0 + conn.update_node(nodeid, attr) + attr = conn.read_node(nodeid) + print attr + + # check orphan node dir + print open(_datapath + "/conn/__NOTEBOOK__/orphans/%s/%s/node.xml" + % (nodeid[:2], nodeid[2:])).read() + + # move orphan out of orphandir + attr["parentids"] = [rootid] + conn.update_node(nodeid, attr) + print conn.read_node(nodeid) + + # check orphan node dir is gone + assert not os.path.exists( + _datapath + "/conn/__NOTEBOOK__/orphans/%s/%s" + % (nodeid[:2], nodeid[2:])) + + # move node into orphandir + attr["parentids"] = [] + conn.update_node(nodeid, attr) + print conn.read_node(nodeid) + + # check orphan node dir is gone + self.assertTrue(os.path.exists( + _datapath + "/conn/__NOTEBOOK__/orphans/%s/%s" + % (nodeid[:2], nodeid[2:]))) diff --git a/tests/test_notebook_sync.py b/tests/test_notebook_sync.py index 60fce5bc8..321021029 100644 --- a/tests/test_notebook_sync.py +++ b/tests/test_notebook_sync.py @@ -3,7 +3,7 @@ import os import unittest -# keepnote imports +# keepnote.py imports from keepnote import notebook import keepnote.notebook.sync as sync @@ -62,7 +62,7 @@ def test_sync(self): # check for newer node attr = notebook2._conn.read_node(n.get_attr("nodeid")) - self.assert_(attr["title"] == "node2") + self.assertTrue(attr["title"] == "node2") # rename node and decrease modified time # transfer should detect conflict and reject transfer @@ -75,5 +75,5 @@ def test_sync(self): # check for original node attr = notebook2._conn.read_node(n.get_attr("nodeid")) - self.assert_(attr["title"] == "node2") + self.assertTrue(attr["title"] == "node2") notebook2.close() diff --git a/tests/test_notebook_sync.py.bak b/tests/test_notebook_sync.py.bak new file mode 100644 index 000000000..60fce5bc8 --- /dev/null +++ b/tests/test_notebook_sync.py.bak @@ -0,0 +1,79 @@ + +# python imports +import os +import unittest + +# keepnote imports +from keepnote import notebook +import keepnote.notebook.sync as sync + +from . import clean_dir, makedirs, TMP_DIR + + +# root path for test data +_datapath = os.path.join(TMP_DIR, 'notebook_sync') + + +class Sync (unittest.TestCase): + + def test_sync(self): + + # initialize two notebooks + clean_dir(_datapath + "/n1") + clean_dir(_datapath + "/n2") + makedirs(_datapath) + + notebook1 = notebook.NoteBook() + notebook1.create(_datapath + "/n1") + + notebook2 = notebook.NoteBook() + notebook2.create(_datapath + "/n2") + + # create a new node in notebook1 + n = notebook1.new_child("text/html", "node1") + for i in range(5): + out = n.open_file("file" + str(i), "w") + out.write("hello" + str(i)) + out.close() + n.open_file("dir/hello", "w").close() + + # transfer node to notebook2 (rename parent) + attr = dict(n._attr) + attr["parentids"] = [notebook2.get_attr("nodeid")] + sync.sync_node(n.get_attr("nodeid"), + notebook1._conn, + notebook2._conn, + attr) + + # check that node was transfered + attr = notebook2._conn.read_node(n.get_attr("nodeid")) + self.assertTrue(attr) + + # rename node and increase modified time + # transfer should detect conflict and use newer node + attr["title"] = "node2" + attr["modified_time"] += 1 + n.open_file("new_file", "w").close() + n.delete_file("file3") + sync.sync_node(attr["nodeid"], + notebook1._conn, + notebook2._conn, + attr) + + # check for newer node + attr = notebook2._conn.read_node(n.get_attr("nodeid")) + self.assert_(attr["title"] == "node2") + + # rename node and decrease modified time + # transfer should detect conflict and reject transfer + attr["title"] = "node3" + attr["modified_time"] -= 10 + sync.sync_node(attr["nodeid"], + notebook1._conn, + notebook2._conn, + attr) + + # check for original node + attr = notebook2._conn.read_node(n.get_attr("nodeid")) + self.assert_(attr["title"] == "node2") + notebook2.close() diff --git a/tests/test_notebook_update.py b/tests/test_notebook_update.py index d4832f875..6b56ea76b 100644 --- a/tests/test_notebook_update.py +++ b/tests/test_notebook_update.py @@ -3,7 +3,7 @@ import shutil import unittest -# keepnote imports +# keepnote.py imports from keepnote.compat import notebook_v1 from keepnote.compat import notebook_v2 from keepnote.compat import notebook_v3 @@ -174,7 +174,7 @@ def test_high(self): try: book.load(notebook_filename) except notebook.NoteBookVersionError: - print "Correctly detects version error" + print("Correctly detects version error") else: - print "Error not detected" - self.assert_(False) + print("Error not detected") + self.assertTrue(False) diff --git a/tests/test_notebook_update.py.bak b/tests/test_notebook_update.py.bak new file mode 100644 index 000000000..d4832f875 --- /dev/null +++ b/tests/test_notebook_update.py.bak @@ -0,0 +1,180 @@ + +# python imports +import shutil +import unittest + +# keepnote imports +from keepnote.compat import notebook_v1 +from keepnote.compat import notebook_v2 +from keepnote.compat import notebook_v3 +from keepnote.compat import notebook_v4 +from keepnote import notebook +from keepnote.notebook import update + +from . import clean_dir, TMP_DIR, DATA_DIR + + +def setup_old_notebook(old_version, new_version): + + # Setup paths. + old_notebook_filename = DATA_DIR + "/notebook-v%s" % old_version + new_notebook_filename = TMP_DIR + "/notebook-v%s-update" % new_version + + # make copy of old notebook + clean_dir(new_notebook_filename) + shutil.copytree(old_notebook_filename, new_notebook_filename) + + return new_notebook_filename + + +class Update (unittest.TestCase): + + def test_v1_to_latest(self): + """test notebook update from version 1 to present.""" + + # Setup paths. + old_version = 1 + new_version = notebook.NOTEBOOK_FORMAT_VERSION + notebook_filename = setup_old_notebook(old_version, new_version) + + # Load old notebook. + book = notebook_v1.NoteBook() + book.load(notebook_filename) + old_attrs = dict(book._attr) + + # Update notebook (in place). + update.update_notebook(notebook_filename, new_version, verify=True) + + # Load new notebook. + book = notebook.NoteBook() + book.load(notebook_filename) + + # Test for common error. + new_attrs = dict(book.iter_attr()) + self.assertEqual(new_attrs['title'], old_attrs['title']) + + book.close() + + def test_v1_v2(self): + + # Setup paths. + old_version = 1 + new_version = 2 + notebook_filename = setup_old_notebook(old_version, new_version) + + # Load old notebook. + book = notebook_v1.NoteBook() + book.load(notebook_filename) + old_attrs = dict(book._attr) + + # Update notebook (in place). + update.update_notebook(notebook_filename, new_version, verify=True) + + # Load new notebook. + book = notebook_v2.NoteBook() + book.load(notebook_filename) + + # Test for common error. + self.assertEqual(book.get_title(), old_attrs['title']) + + def test_v2_v3(self): + + # Setup paths. + old_version = 2 + new_version = 3 + notebook_filename = setup_old_notebook(old_version, new_version) + + # Load old notebook. + book = notebook_v2.NoteBook() + book.load(notebook_filename) + old_attrs = dict(book._attr) + + # Update notebook (in place). + update.update_notebook(notebook_filename, new_version, verify=True) + + # Load new notebook. + book = notebook_v3.NoteBook() + book.load(notebook_filename) + + # Test for common error. + self.assertEqual(book.get_title(), old_attrs['title']) + + def test_v3_to_v4(self): + + # Setup paths. + old_version = 3 + new_version = 4 + notebook_filename = setup_old_notebook(old_version, new_version) + + # Load old notebook. + book = notebook_v3.NoteBook() + book.load(notebook_filename) + old_attrs = dict(book._attr) + + # Update notebook (in place). + update.update_notebook(notebook_filename, new_version, verify=True) + + # Load new notebook. + book = notebook_v4.NoteBook() + book.load(notebook_filename) + + # Test for common error. + self.assertEqual(book.get_title(), old_attrs['title']) + + def test_v4_to_latest(self): + + # Setup paths. + old_version = 4 + new_version = notebook.NOTEBOOK_FORMAT_VERSION + notebook_filename = setup_old_notebook(old_version, new_version) + + # Load old notebook. + book = notebook_v4.NoteBook() + book.load(notebook_filename) + old_attrs = dict(book._attr) + book.close() + + # Update notebook (in place). + update.update_notebook(notebook_filename, new_version, verify=True) + + # Load new notebook. + book = notebook.NoteBook() + book.load(notebook_filename) + + # Test for common error. + self.assertEqual(book.get_title(), old_attrs['title']) + book.close() + + def test_v5_to_latest(self): + + # Setup paths. + old_version = 5 + new_version = notebook.NOTEBOOK_FORMAT_VERSION + notebook_filename = setup_old_notebook(old_version, new_version) + + # Update notebook (in place). + update.update_notebook(notebook_filename, new_version, verify=True) + + # Load new notebook. + book = notebook.NoteBook() + book.load(notebook_filename) + + # Test for common error. + old_title = 'Test Example Notebook' + self.assertEqual(book.get_title(), old_title) + book.close() + + def test_high(self): + + old_version = 'HIGH' + new_version = notebook.NOTEBOOK_FORMAT_VERSION + notebook_filename = setup_old_notebook(old_version, new_version) + + book = notebook.NoteBook() + try: + book.load(notebook_filename) + except notebook.NoteBookVersionError: + print "Correctly detects version error" + else: + print "Error not detected" + self.assert_(False) diff --git a/tests/test_plist.py b/tests/test_plist.py index ecf9c4559..cb24f18be 100644 --- a/tests/test_plist.py +++ b/tests/test_plist.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from StringIO import StringIO +from io import StringIO import unittest from keepnote import plist diff --git a/tests/test_plist.py.bak b/tests/test_plist.py.bak new file mode 100644 index 000000000..ecf9c4559 --- /dev/null +++ b/tests/test_plist.py.bak @@ -0,0 +1,48 @@ +#!/usr/bin/env python + +from StringIO import StringIO +import unittest + +from keepnote import plist + + +class PListTest(unittest.TestCase): + def test_read_write_file(self): + data = { + 'aaa': 444, + '11': True, + } + plist_xml = ("aaa444" + "11") + + elm = plist.load(StringIO(plist_xml)) + self.assertEqual(elm, data) + + out = StringIO() + plist.dump(elm, out) + self.assertEqual(out.getvalue(), plist_xml) + + def test_read_write_string(self): + data = { + "version": [1, 0, 3], + "kind": "nice", + "measure": 3.03, + "use_feature": True + } + plist_xml = """\ + + kindnice + version + 1 + 0 + 3 + + use_feature + measure3.030000 + +""" + elm = plist.loads(plist_xml) + self.assertEqual(elm, data) + + text = plist.dumps(data, indent=4) + self.assertEqual(text, plist_xml) diff --git a/tests/test_pyobject.py b/tests/test_pyobject.py new file mode 100644 index 000000000..76c559c56 --- /dev/null +++ b/tests/test_pyobject.py @@ -0,0 +1,2 @@ +import platform +print(platform.architecture()) \ No newline at end of file diff --git a/tests/test_richtext_html.py b/tests/test_richtext_html.py index 6d171fa54..e6f778499 100644 --- a/tests/test_richtext_html.py +++ b/tests/test_richtext_html.py @@ -3,10 +3,10 @@ # python import import time import sys -from StringIO import StringIO +from io import StringIO from unittest import TestCase -# keepnote imports +# keepnote.py imports from keepnote.gui.richtext.richtext_html import HtmlBuffer, nest_indent_tags, \ find_paragraphs, P_TAG from keepnote.gui.richtext import RichTextIO @@ -86,7 +86,7 @@ def read_write(self, str_in, str_out=None): self.read(self.buffer, infile) self.write(self.buffer, outfile) - self.assertEquals(outfile.getvalue(), str_out) + self.assertEqual(outfile.getvalue(), str_out) #=================================================== @@ -131,7 +131,7 @@ def test_leading_space(self): self.buffer.clear() self.read(self.buffer, StringIO("
\n x")) - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['\n x']) self.buffer.clear() @@ -139,14 +139,14 @@ def test_leading_space(self): def test_read_hr(self): self.read(self.buffer, StringIO("line1
line2")) - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['line1\n', 'anchor', '\nline2']) self.buffer.clear() self.read(self.buffer, StringIO("line1

\nline2")) - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['line1\n', 'anchor', '\n\nline2']) @@ -154,7 +154,7 @@ def test_read_hr(self): # what if
has newlines around it in HTML? self.buffer.clear() self.read(self.buffer, StringIO("line1\n
\n
\nline2")) - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['line1 \n', 'anchor', '\n \nline2']) @@ -199,12 +199,12 @@ def test_hr(self): def test_font_other(self): contents = self.io.read(StringIO('hello'), partial=True) - self.assertEqual(map(display_item, contents), + self.assertEqual(list(map(display_item, contents)), ['beginstr:bold', 'hello', 'endstr:bold']) contents = self.io.read(StringIO('hello'), partial=True) - self.assertEqual(map(display_item, contents), + self.assertEqual(list(map(display_item, contents)), ['beginstr:italic', 'hello', 'endstr:italic']) def test_ol1(self): @@ -252,7 +252,7 @@ def test_ol5(self): None, None, ignore_tag)) # check the internal indentation structure - self.assertEquals([display_item(x) for x in contents], + self.assertEqual([display_item(x) for x in contents], ['line0\n', 'BEGIN:indent 1 none', 'line1\nline2\n', @@ -277,7 +277,7 @@ def test_ol6(self): None, None, ignore_tag)) # check the internal indentation structure - self.assertEquals([display_item(x) for x in contents], + self.assertEqual([display_item(x) for x in contents], ['line0\n', 'BEGIN:indent 1 none', 'line1\nline2\n', @@ -312,18 +312,18 @@ def test_bullet(self): isinstance(tag, RichTextIndentTag) or tag == P_TAG)) self.io.prepare_dom_write(dom) - print + print() dom.display() # check the internal indentation structure - self.assertEquals([display_item(x) for x in contents], + self.assertEqual([display_item(x) for x in contents], ['BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line1\n', 'BEGIN:bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'end1\n', 'END:indent 1 bullet', @@ -332,7 +332,7 @@ def test_bullet(self): outfile = StringIO() self.write(self.buffer, outfile) - self.assertEquals(outfile.getvalue(), + self.assertEqual(outfile.getvalue(), '
  • line1
    • \n' '
  • end1
    • \n
\nend2
\n') @@ -353,7 +353,7 @@ def test_par(self): find_paragraphs(self.get_contents()), is_stable_tag=lambda tag: tag == P_TAG)) - self.assertEquals([display_item(x) for x in contents], + self.assertEqual([display_item(x) for x in contents], ['BEGIN:p', 'word1 ', 'BEGIN:bold', @@ -395,10 +395,10 @@ def test_bullet3(self): None, None, ignore_tag)) # check the internal indentation structure - self.assertEquals([display_item(x) for x in contents], + self.assertEqual([display_item(x) for x in contents], ['BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line1\n', 'END:indent 1 bullet', @@ -421,7 +421,7 @@ def test_bullet4(self): None, None, ignore_tag)) # check the internal indentation structure - self.assertEquals([display_item(x) for x in contents1], + self.assertEqual([display_item(x) for x in contents1], [display_item(x) for x in contents2]) def test_bullet5(self): @@ -437,8 +437,8 @@ def test_bullet5(self): self.buffer.toggle_bullet_list() - print [display_item(x) for x in iter_buffer_contents( - self.buffer, None, None, ignore_tag)] + print([display_item(x) for x in iter_buffer_contents( + self.buffer, None, None, ignore_tag)]) self.buffer.undo() @@ -446,7 +446,7 @@ def test_bullet5(self): None, None, ignore_tag)) # check the internal indentation structure - self.assertEquals([display_item(x) for x in contents1], + self.assertEqual([display_item(x) for x in contents1], [display_item(x) for x in contents2]) def test_bullet_insert(self): @@ -468,7 +468,7 @@ def test_bullet_insert(self): None, None, ignore_tag)) # check the internal indentation structure - self.assertEquals([display_item(x) for x in contents1], + self.assertEqual([display_item(x) for x in contents1], [display_item(x) for x in contents2]) def test_bullet_apply_tag(self): @@ -485,16 +485,16 @@ def test_bullet_apply_tag(self): it2.forward_chars(2) tag = self.buffer.tag_table.lookup("indent 2 none") - print tag.is_par_related() + print(tag.is_par_related()) self.buffer.apply_tag_selected(tag, it, it2) contents1 = list(iter_buffer_contents(self.buffer, None, None, ignore_tag)) # check the internal indentation structure - self.assertEquals([display_item(x) for x in contents1], + self.assertEqual([display_item(x) for x in contents1], ['BEGIN:indent 2 none', - u'line1\n', + 'line1\n', 'END:indent 2 none']) def test_bullet_blank_lines(self): @@ -508,17 +508,17 @@ def test_bullet_blank_lines(self): '
  • line2
    • \n' '
\n')) - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line1\n', 'END:indent 1 bullet', '\n', 'BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line2\n', 'END:indent 1 bullet']) @@ -542,16 +542,16 @@ def test_bullet_newlines_deep_indent(self): '
  • \n' '\n')) - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:bullet', 'BEGIN:indent 2 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line1\n', 'END:indent 2 bullet', 'BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', '\n', 'END:indent 1 bullet']) @@ -575,34 +575,34 @@ def test_bullet_new_lines(self): ['\n', 'BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + u'\\u2022 ', 'END:bullet', 'line1\n', 'END:indent 1 bullet', '\n', 'BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + u'\\u2022 ', 'END:bullet', 'line2\n', 'END:indent 1 bullet']) ''' - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', '\n', 'BEGIN:bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line1\n', 'END:indent 1 bullet', '\n', 'BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line2\n', 'END:indent 1 bullet']) @@ -624,16 +624,16 @@ def test_bullet_undo(self): self.write(self.buffer, sys.stdout) - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:bullet', 'BEGIN:indent 1 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line1\n', 'END:indent 1 bullet', 'BEGIN:bullet', 'BEGIN:indent 2 bullet', - u'\u2022 ', + '\u2022 ', 'END:bullet', 'line2\n', 'END:indent 2 bullet']) @@ -655,11 +655,11 @@ def test_image1(self): def test_PushIter(self): """Test the PushIter class""" lst = [] - it = PushIter(xrange(10)) + it = PushIter(range(10)) - lst.append(it.next()) - lst.append(it.next()) - lst.append(it.next()) + lst.append(next(it)) + lst.append(next(it)) + lst.append(next(it)) it.push('c') it.push('b') @@ -670,7 +670,7 @@ def test_PushIter(self): lst2 = list(it) - self.assertEquals(lst2, [0, 1, 2, 'a', 'b', 'c', 3, 4, 5, 6, 7, 8, 9]) + self.assertEqual(lst2, [0, 1, 2, 'a', 'b', 'c', 3, 4, 5, 6, 7, 8, 9]) def test_body(self): @@ -689,7 +689,7 @@ def test_comments(self): """ hello bye"""), partial=True) - self.assertEqual(map(display_item, contents), + self.assertEqual(list(map(display_item, contents)), [' hello bye']) @@ -703,4 +703,4 @@ def _test_speed(self): io.load(None, buf, "test/data/notebook-v4/stress tests/" "A huge page of formatted text/page.html") - print time.time() - t + print(time.time() - t) diff --git a/tests/test_richtext_html.py.bak b/tests/test_richtext_html.py.bak new file mode 100644 index 000000000..9dae1e5e7 --- /dev/null +++ b/tests/test_richtext_html.py.bak @@ -0,0 +1,706 @@ +#!/usr/bin/env python + +# python import +import time +import sys +from StringIO import StringIO +from unittest import TestCase + +# keepnote.py imports +from keepnote.gui.richtext.richtext_html import HtmlBuffer, nest_indent_tags, \ + find_paragraphs, P_TAG +from keepnote.gui.richtext import RichTextIO + +from keepnote.gui.richtext.richtextbuffer import RichTextBuffer, ignore_tag, \ + RichTextIndentTag + +from keepnote.gui.richtext.textbuffer_tools import \ + insert_buffer_contents, \ + normalize_tags, \ + iter_buffer_contents, \ + PushIter, \ + TextBufferDom + + +def display_item(item): + """Return a string representing a buffer item""" + + if item[0] == "text": + return item[2] + elif item[0] == "begin": + return "BEGIN:" + item[2].get_property('name') + elif item[0] == "end": + return "END:" + item[2].get_property('name') + elif item[0] == "anchor": + return item[0] + else: + return item[0] + ":" + item[2] + + +class BufferBase (TestCase): + + def setUp(self): + self.buffer = RichTextBuffer() + + def tearDown(self): + self.buffer.clear() + + def insert(self, buffer, contents): + insert_buffer_contents( + buffer, + buffer.get_iter_at_mark( + buffer.get_insert()), + contents, + add_child=lambda buffer, it, anchor: buffer.add_child(it, anchor), + lookup_tag=lambda tagstr: buffer.tag_table.lookup(tagstr)) + + def get_contents(self): + return list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + +class Html (BufferBase): + + def setUp(self): + BufferBase.setUp(self) + self.io = HtmlBuffer() + + def read(self, buffer, infile): + contents = list(self.io.read(infile, partial=True)) + self.insert(self.buffer, contents) + + def write(self, buffer, outfile): + contents = iter_buffer_contents(self.buffer, None, None, ignore_tag) + self.io.set_output(outfile) + self.io.write(contents, self.buffer.tag_table, partial=True) + + def read_write(self, str_in, str_out=None): + """Given the input string 'str_in' will the buffer write 'str_out'""" + if str_out is None: + str_out = str_in + + infile = StringIO(str_in) + outfile = StringIO() + + # read/write + self.read(self.buffer, infile) + self.write(self.buffer, outfile) + + self.assertEquals(outfile.getvalue(), str_out) + + #=================================================== + + def test_nested_tags(self): + """Simple read/write, text should not change""" + self.read_write("xabcdey") + + def test_unnormalized_input(self): + """Tags should be normalized when writing, + output should not be equal.""" + self.read_write("hello", + "hello") + + def test_normalized_tags(self): + self.read_write("helloagain") + + def test_newlines(self): + self.read_write("line1
    \n
    \nline2") + + def test_newlines2(self): + self.read_write("line1

    line2", + "line1
    \n
    \nline2") + + def test_entity(self): + self.read_write(" &><      ") + + def test_spacing(self): + """Escaping multiple spaces""" + self.read_write("     ") + + def test_spacing2(self): + """First space will be literal, thus output should not be equal""" + self.read_write("line1\nline2", + "line1 line2") + + def test_leading_space(self): + """Do leading spaces remain preserved""" + self.read_write(" x") + + self.buffer.clear() + self.read_write("  x") + + self.buffer.clear() + self.read(self.buffer, StringIO("
    \n x")) + self.assertEquals([display_item(x) for x in self.get_contents()], + ['\n x']) + + self.buffer.clear() + self.read_write("
    \n x") + + def test_read_hr(self): + self.read(self.buffer, StringIO("line1
    line2")) + self.assertEquals([display_item(x) for x in self.get_contents()], + ['line1\n', + 'anchor', + '\nline2']) + + self.buffer.clear() + self.read(self.buffer, StringIO("line1

    \nline2")) + self.assertEquals([display_item(x) for x in self.get_contents()], + ['line1\n', + 'anchor', + '\n\nline2']) + + # what if
    has newlines around it in HTML? + self.buffer.clear() + self.read(self.buffer, StringIO("line1\n
    \n
    \nline2")) + self.assertEquals([display_item(x) for x in self.get_contents()], + ['line1 \n', + 'anchor', + '\n \nline2']) + + def test_font_family(self): + self.read_write('hello') + + def test_font_size(self): + self.read_write('hello') + + def test_font_justification(self): + self.read(self.buffer, StringIO( + '
    hello
    \nagain
    ')) + + #contents = normalize_tags(find_paragraphs( + # nest_indent_tags(self.get_contents(), self.buffer.tag_table)), + # is_stable_tag=lambda tag: + # isinstance(tag, RichTextIndentTag) or tag == P_TAG) + + #contents = find_paragraphs( + # nest_indent_tags(self.get_contents(), self.buffer.tag_table)) + #print ">>>", [display_item(x) for x in contents] + + self.buffer.clear() + self.read_write( + '
    hello
    \nagain
    ') + + def test_font_many(self): + self.read_write( + '
    hello
    \nagain
    ', + '
    ' + '' + '' + 'hello
    \nagain
    ') + + def test_hr(self): + self.read_write('line1

    \nline2') + self.buffer.clear() + self.read_write('line1
    line2') + + def test_font_other(self): + contents = self.io.read(StringIO('hello'), + partial=True) + self.assertEqual(map(display_item, contents), + ['beginstr:bold', 'hello', 'endstr:bold']) + + contents = self.io.read(StringIO('hello'), + partial=True) + self.assertEqual(map(display_item, contents), + ['beginstr:italic', 'hello', 'endstr:italic']) + + def test_ol1(self): + self.read_write( + '
    • line1
      • \n' + '
    • line2
      • \n
    \n') + + def test_ol2(self): + self.read_write( + 'line0
    • line1
      • \n' + '
    • line2
      • \n' + '
      • ' + '
      • line3
        • \n' + '
      • line4
        • \n
      \n
      • \n' + '
    • line5
      • \n
    \nline6') + + def test_ol3(self): + self.read_write( + 'line1
    • line1.5
      • \n' + '
      • ' + '
      • line2
        • \n' + '
      • line3
        • \n
      ' + '\n
      • \n
    \nline4') + + def test_ol4(self): + self.read_write( + 'line0
    • ' + 'line1
      • \n' + '
    • line2
      • \n' + '
      • ' + '
      • line3
        • \n' + '
      • line4
        • \n' + '
      \n
      • \n
    • line5
      • \n' + '
    \nline6    ') + + def test_ol5(self): + infile = StringIO( + 'line0
    • line1
      \n' + 'line2
      • line3
        \n' + 'line4
        \n
        • \n
      \n
      • \n' + '
    • line5
      • \n
    \nline6') + self.read(self.buffer, infile) + + contents = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + # check the internal indentation structure + self.assertEquals([display_item(x) for x in contents], + ['line0\n', + 'BEGIN:indent 1 none', + 'line1\nline2\n', + 'END:indent 1 none', + 'BEGIN:indent 2 none', + 'line3\nline4\n\n', + 'END:indent 2 none', + 'BEGIN:indent 1 none', + 'line5\n', + 'END:indent 1 none', + 'line6']) + + def test_ol6(self): + infile = StringIO( + 'line0
    • line1
      \n' + 'line2
      • line3
        \n' + 'line4
        \n
        • \n
      \n' + '
      • \n
    \nline5') + self.read(self.buffer, infile) + + contents = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + # check the internal indentation structure + self.assertEquals([display_item(x) for x in contents], + ['line0\n', + 'BEGIN:indent 1 none', + 'line1\nline2\n', + 'END:indent 1 none', + 'BEGIN:indent 2 none', + 'line3\nline4\n\n', + 'END:indent 2 none', + 'line5']) + + def test_ol7(self): + self.read_write( + 'line0
    • ' + '
      • line1
        • \n' + '
      • line2
        • \n
      \n
      • \n' + '
    • line3
      • \n' + '
    \nline4') + + def test_bullet(self): + self.buffer.insert_at_cursor("end1\nend2\n") + self.buffer.place_cursor(self.buffer.get_start_iter()) + #self.buffer.indent() + self.buffer.toggle_bullet_list() + self.buffer.insert_at_cursor("line1\n") + + contents = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + dom = TextBufferDom( + normalize_tags(find_paragraphs( + nest_indent_tags(self.get_contents(), self.buffer.tag_table)), + is_stable_tag=lambda tag: + isinstance(tag, RichTextIndentTag) or + tag == P_TAG)) + self.io.prepare_dom_write(dom) + print + dom.display() + + # check the internal indentation structure + self.assertEquals([display_item(x) for x in contents], + ['BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + 'line1\n', + 'BEGIN:bullet', + u'\u2022 ', + 'END:bullet', + 'end1\n', + 'END:indent 1 bullet', + 'end2\n']) + + outfile = StringIO() + self.write(self.buffer, outfile) + + self.assertEquals(outfile.getvalue(), + '
    • line1
      • \n' + '
    • end1
      • \n
    \nend2
    \n') + + def test_bullet2(self): + self.read_write( + 'line0
    • line1
      • \n' + '
    • line2
      • \n' + '
      • line3
        • \n' + '
      • line4
        • \n
      \n
      • \n' + '
    • line5
      • \n' + '
    \nline6    ') + + def test_par(self): + self.read(self.buffer, StringIO( + """word1 word2
    \nword3     word4
    \n""")) + + contents = list(normalize_tags( + find_paragraphs(self.get_contents()), + is_stable_tag=lambda tag: tag == P_TAG)) + + self.assertEquals([display_item(x) for x in contents], + ['BEGIN:p', + 'word1 ', + 'BEGIN:bold', + 'word2\n', + 'END:bold', + 'END:p', + 'BEGIN:bold', + 'END:bold', + 'BEGIN:p', + 'BEGIN:bold', + 'word3', + 'END:bold', + ' word4\n', + 'END:p']) + + def test_bullet3(self): + """ + Test to see if current_tags is set from text to the right when + cursor is at start of line + """ + self.buffer.insert_at_cursor("\nend") + self.buffer.place_cursor(self.buffer.get_start_iter()) + + self.buffer.insert_at_cursor("line1") + self.buffer.toggle_bullet_list() + self.buffer.insert_at_cursor("\nline2") + self.buffer.unindent() + + # move to start of "line2" + it = self.buffer.get_iter_at_mark(self.buffer.get_insert()) + it.backward_line() + it.forward_line() + self.buffer.place_cursor(it) + + # insert text, it should not be indented + self.buffer.insert_at_cursor("new ") + + contents = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + # check the internal indentation structure + self.assertEquals([display_item(x) for x in contents], + ['BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + 'line1\n', + 'END:indent 1 bullet', + 'new line2\nend']) + + def test_bullet4(self): + """ + Test undo toggle bullet + """ + + self.buffer.insert_at_cursor("line1") + + contents1 = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + self.buffer.toggle_bullet_list() + self.buffer.undo() + + contents2 = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + # check the internal indentation structure + self.assertEquals([display_item(x) for x in contents1], + [display_item(x) for x in contents2]) + + def test_bullet5(self): + """ + Test undo toggle bullet with font + """ + + self.buffer.toggle_tag_selected(self.buffer.tag_table.lookup("bold")) + self.buffer.insert_at_cursor("line1") + + contents1 = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + self.buffer.toggle_bullet_list() + + print [display_item(x) for x in iter_buffer_contents( + self.buffer, None, None, ignore_tag)] + + self.buffer.undo() + + contents2 = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + # check the internal indentation structure + self.assertEquals([display_item(x) for x in contents1], + [display_item(x) for x in contents2]) + + def test_bullet_insert(self): + """ + Test whether insert inside bullet string '* ' is rejected + """ + + self.buffer.toggle_bullet_list() + self.buffer.insert_at_cursor("line1") + + contents1 = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + it = self.buffer.get_start_iter() + it.forward_chars(1) + self.buffer.insert(it, "XXX") + + contents2 = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + # check the internal indentation structure + self.assertEquals([display_item(x) for x in contents1], + [display_item(x) for x in contents2]) + + def test_bullet_apply_tag(self): + """ + Test whether par_related tags are properly handled + """ + + self.buffer.toggle_bullet_list() + self.buffer.insert_at_cursor("line1") + + it = self.buffer.get_start_iter() + #it.forward_chars(1) + it2 = self.buffer.get_start_iter() + it2.forward_chars(2) + + tag = self.buffer.tag_table.lookup("indent 2 none") + print tag.is_par_related() + self.buffer.apply_tag_selected(tag, it, it2) + + contents1 = list(iter_buffer_contents(self.buffer, + None, None, ignore_tag)) + + # check the internal indentation structure + self.assertEquals([display_item(x) for x in contents1], + ['BEGIN:indent 2 none', + u'line1\n', + 'END:indent 2 none']) + + def test_bullet_blank_lines(self): + """ + Make sure blank lines b/w bullets do not disappear + """ + + self.read(self.buffer, StringIO( + '
    • line1
      • \n' + '
    \n' + '
    • line2
      • \n' + '
    \n')) + + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + 'line1\n', + 'END:indent 1 bullet', + '\n', + 'BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + 'line2\n', + 'END:indent 1 bullet']) + + self.buffer.clear() + + self.read_write( + '
    • line1
      • \n' + '
    \n' + '
    \n' + '
    • line2
      • \n' + '
    \n') + + def test_bullet_newlines_deep_indent(self): + """ + Make sure blank lines b/w bullets do not disappear + """ + self.read(self.buffer, StringIO( + '
    1. ' + '
      1. line1
        2. \n
      \n
      2. \n' + '
    2. \n' + '
    \n')) + + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:bullet', + 'BEGIN:indent 2 bullet', + u'\u2022 ', + 'END:bullet', + 'line1\n', + 'END:indent 2 bullet', + 'BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + '\n', + 'END:indent 1 bullet']) + + def test_bullet_new_lines(self): + """ + Make sure newlines can be added at front of bullet + """ + + self.read(self.buffer, StringIO( + '
    1. line1
      2. \n' + '
    \n' + '
    1. line2
      2. \n' + '
    \n')) + + self.buffer.place_cursor(self.buffer.get_start_iter()) + self.buffer.insert_at_cursor("\n") + + ''' + self.assertEquals([display_item(x) for x in self.get_contents()], + ['\n', + 'BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + 'line1\n', + 'END:indent 1 bullet', + '\n', + 'BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + 'line2\n', + 'END:indent 1 bullet']) + ''' + + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + '\n', + 'BEGIN:bullet', + u'\u2022 ', + 'END:bullet', + 'line1\n', + 'END:indent 1 bullet', + '\n', + 'BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + 'line2\n', + 'END:indent 1 bullet']) + + def test_bullet_undo(self): + """Make sure bullets interact with undo correctly""" + + self.read(self.buffer, StringIO( + '''
    • line1
      • +
      • line2
        • +
      +
      • +
    ''')) + + self.write(self.buffer, sys.stdout) + + self.buffer.undo() + self.buffer.redo() + + self.write(self.buffer, sys.stdout) + + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:bullet', + 'BEGIN:indent 1 bullet', + u'\u2022 ', + 'END:bullet', + 'line1\n', + 'END:indent 1 bullet', + 'BEGIN:bullet', + 'BEGIN:indent 2 bullet', + u'\u2022 ', + 'END:bullet', + 'line2\n', + 'END:indent 2 bullet']) + + '''def test_bullet_delete(self): + """Remove bullet with delete""" + + self.read(self.buffer, StringIO( + """
    • hello
    \n""")) + + print [display_item(x) for x in self.get_contents()] + self.buffer.place_cursor(self.buffer.get_start_iter()) + ''' + + def test_image1(self): + """Simple read/write, text should not change""" + self.read_write('') + + def test_PushIter(self): + """Test the PushIter class""" + lst = [] + it = PushIter(xrange(10)) + + lst.append(it.next()) + lst.append(it.next()) + lst.append(it.next()) + + it.push('c') + it.push('b') + it.push('a') + + for i in reversed(lst): + it.push(i) + + lst2 = list(it) + + self.assertEquals(lst2, [0, 1, 2, 'a', 'b', 'c', 3, 4, 5, 6, 7, 8, 9]) + + def test_body(self): + + contents = list(self.io.read(StringIO( + "title" + "Hello world"), + partial=False)) + self.assertEqual(contents, [('text', None, 'Hello world')]) + + contents = list(self.io.read(StringIO("Hello world"), + partial=True)) + self.assertEqual(contents, [('text', None, 'Hello world')]) + + def test_comments(self): + contents = self.io.read(StringIO( + """ hello bye"""), + partial=True) + + self.assertEqual(map(display_item, contents), + [' hello bye']) + + +class Speed (TestCase): + + def _test_speed(self): + buf = RichTextBuffer() + io = RichTextIO() + + t = time.time() + io.load(None, buf, + "test/data/notebook-v4/stress tests/" + "A huge page of formatted text/page.html") + print time.time() - t diff --git a/tests/test_richtextbuffer.py b/tests/test_richtextbuffer.py index 3fa425463..07d001123 100644 --- a/tests/test_richtextbuffer.py +++ b/tests/test_richtextbuffer.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# keepnote imports +# keepnote.py imports from keepnote.gui.richtext.textbuffer_tools import TextBufferDom from .test_richtext_html import display_item, BufferBase @@ -19,7 +19,7 @@ def test_dom(self): self.buffer.insert_at_cursor(" again") self.buffer.toggle_tag_selected(italic) self.buffer.insert_at_cursor(" this is me") - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['hi there', 'BEGIN:bold', ' hello', @@ -30,10 +30,10 @@ def test_dom(self): 'END:bold']) dom = TextBufferDom(self.get_contents()) - print + print() dom.display() - self.assertEquals([display_item(x) for x in dom.get_contents()], + self.assertEqual([display_item(x) for x in dom.get_contents()], ['hi there', 'BEGIN:bold', ' hello', @@ -48,29 +48,29 @@ def test_undo_insert(self): self.buffer.insert_at_cursor("hi there") self.buffer.insert_at_cursor(" again") - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['hi there again']) # undo insert self.buffer.undo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['hi there']) # undo insert self.buffer.undo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], []) # redo insert self.buffer.redo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['hi there']) # do bold insert bold = self.buffer.tag_table.lookup("bold") self.buffer.toggle_tag_selected(bold) self.buffer.insert_at_cursor(" hello") - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['hi there', 'BEGIN:bold', ' hello', @@ -78,24 +78,24 @@ def test_undo_insert(self): # undo bold insert self.buffer.undo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['hi there']) # undo everything self.buffer.undo() self.buffer.undo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], []) # redo first insert self.buffer.redo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['hi there']) # redo bold insert self.buffer.redo() self.buffer.redo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['hi there', 'BEGIN:bold', ' hello', @@ -108,7 +108,7 @@ def test_undo_insert2(self): bold = self.buffer.tag_table.lookup("bold") self.buffer.toggle_tag_selected(bold) self.buffer.insert_at_cursor("hi there") - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:bold', 'hi there', 'END:bold']) @@ -116,7 +116,7 @@ def test_undo_insert2(self): # do unbold insert self.buffer.toggle_tag_selected(bold) self.buffer.insert_at_cursor(" hello") - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:bold', 'hi there', 'END:bold', @@ -124,7 +124,7 @@ def test_undo_insert2(self): # undo bold insert self.buffer.undo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:bold', 'hi there', 'END:bold']) @@ -132,7 +132,7 @@ def test_undo_insert2(self): # redo unbold insert # TEST: bug was that ' hello' would also be bold self.buffer.redo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:bold', 'hi there', 'END:bold', @@ -153,13 +153,13 @@ def test_undo_family(self): self.buffer.undo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:family Serif', 'hello', 'END:family Serif']) self.buffer.redo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:family Monospace', 'hello', 'END:family Monospace']) @@ -177,13 +177,13 @@ def test_undo_size(self): self.buffer.get_end_iter()) self.buffer.undo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:size 20', 'hello', 'END:size 20']) self.buffer.redo() - self.assertEquals([display_item(x) for x in self.get_contents()], + self.assertEqual([display_item(x) for x in self.get_contents()], ['BEGIN:size 30', 'hello', 'END:size 30']) diff --git a/tests/test_richtextbuffer.py.bak b/tests/test_richtextbuffer.py.bak new file mode 100644 index 000000000..7d28ab4a9 --- /dev/null +++ b/tests/test_richtextbuffer.py.bak @@ -0,0 +1,189 @@ +#!/usr/bin/env python + +# keepnote.py imports +from keepnote.gui.richtext.textbuffer_tools import TextBufferDom +from .test_richtext_html import display_item, BufferBase + + +class TestCaseRichTextBuffer (BufferBase): + + def test_dom(self): + self.buffer.insert_at_cursor("hi there") + + # do bold insert + bold = self.buffer.tag_table.lookup("bold") + italic = self.buffer.tag_table.lookup("italic") + self.buffer.toggle_tag_selected(bold) + self.buffer.insert_at_cursor(" hello") + self.buffer.toggle_tag_selected(italic) + self.buffer.insert_at_cursor(" again") + self.buffer.toggle_tag_selected(italic) + self.buffer.insert_at_cursor(" this is me") + self.assertEquals([display_item(x) for x in self.get_contents()], + ['hi there', + 'BEGIN:bold', + ' hello', + 'BEGIN:italic', + ' again', + 'END:italic', + ' this is me', + 'END:bold']) + + dom = TextBufferDom(self.get_contents()) + print + dom.display() + + self.assertEquals([display_item(x) for x in dom.get_contents()], + ['hi there', + 'BEGIN:bold', + ' hello', + 'BEGIN:italic', + ' again', + 'END:italic', + ' this is me', + 'END:bold']) + + def test_undo_insert(self): + """Text insert with current font can be undone""" + self.buffer.insert_at_cursor("hi there") + self.buffer.insert_at_cursor(" again") + + self.assertEquals([display_item(x) for x in self.get_contents()], + ['hi there again']) + + # undo insert + self.buffer.undo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['hi there']) + + # undo insert + self.buffer.undo() + self.assertEquals([display_item(x) for x in self.get_contents()], + []) + + # redo insert + self.buffer.redo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['hi there']) + + # do bold insert + bold = self.buffer.tag_table.lookup("bold") + self.buffer.toggle_tag_selected(bold) + self.buffer.insert_at_cursor(" hello") + self.assertEquals([display_item(x) for x in self.get_contents()], + ['hi there', + 'BEGIN:bold', + ' hello', + 'END:bold']) + + # undo bold insert + self.buffer.undo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['hi there']) + + # undo everything + self.buffer.undo() + self.buffer.undo() + self.assertEquals([display_item(x) for x in self.get_contents()], + []) + + # redo first insert + self.buffer.redo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['hi there']) + + # redo bold insert + self.buffer.redo() + self.buffer.redo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['hi there', + 'BEGIN:bold', + ' hello', + 'END:bold']) + + def test_undo_insert2(self): + """Text insert with current font can be undone""" + + # do bold insert + bold = self.buffer.tag_table.lookup("bold") + self.buffer.toggle_tag_selected(bold) + self.buffer.insert_at_cursor("hi there") + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:bold', + 'hi there', + 'END:bold']) + + # do unbold insert + self.buffer.toggle_tag_selected(bold) + self.buffer.insert_at_cursor(" hello") + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:bold', + 'hi there', + 'END:bold', + ' hello']) + + # undo bold insert + self.buffer.undo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:bold', + 'hi there', + 'END:bold']) + + # redo unbold insert + # TEST: bug was that ' hello' would also be bold + self.buffer.redo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:bold', + 'hi there', + 'END:bold', + ' hello']) + + def test_undo_family(self): + """Font family change can be undone""" + + self.buffer.insert_at_cursor("hello") + + tag = self.buffer.tag_table.lookup("family Serif") + self.buffer.apply_tag_selected(tag, self.buffer.get_start_iter(), + self.buffer.get_end_iter()) + + tag = self.buffer.tag_table.lookup("family Monospace") + self.buffer.apply_tag_selected(tag, self.buffer.get_start_iter(), + self.buffer.get_end_iter()) + + self.buffer.undo() + + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:family Serif', + 'hello', + 'END:family Serif']) + + self.buffer.redo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:family Monospace', + 'hello', + 'END:family Monospace']) + + def test_undo_size(self): + """Font size change can be undone""" + self.buffer.insert_at_cursor("hello") + + tag = self.buffer.tag_table.lookup("size 20") + self.buffer.apply_tag_selected(tag, self.buffer.get_start_iter(), + self.buffer.get_end_iter()) + + tag = self.buffer.tag_table.lookup("size 30") + self.buffer.apply_tag_selected(tag, self.buffer.get_start_iter(), + self.buffer.get_end_iter()) + + self.buffer.undo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:size 20', + 'hello', + 'END:size 20']) + + self.buffer.redo() + self.assertEquals([display_item(x) for x in self.get_contents()], + ['BEGIN:size 30', + 'hello', + 'END:size 30']) diff --git a/tests/test_safefile.py b/tests/test_safefile.py index 1b11252eb..e92759531 100644 --- a/tests/test_safefile.py +++ b/tests/test_safefile.py @@ -22,13 +22,13 @@ def test1(self): out = safefile.open(filename, "w", codec="utf-8") tmp = out.get_tempfile() - out.write(u"\u2022 hello\n") - out.write(u"there") + out.write("\u2022 hello\n") + out.write("there") out.close() - self.assertEquals(safefile.open(filename, codec="utf-8").read(), - u"\u2022 hello\nthere") - self.assertEquals(os.path.exists(tmp), False) + self.assertEqual(safefile.open(filename, codec="utf-8").read(), + "\u2022 hello\nthere") + self.assertEqual(os.path.exists(tmp), False) def test2(self): """test unsuccessful write""" @@ -48,29 +48,29 @@ def test2(self): except: pass - self.assertEquals(safefile.open(filename, codec="utf-8").read(), - u"\u2022 hello\nthere") - self.assertEquals(os.path.exists(out.get_tempfile()), True) + self.assertEqual(safefile.open(filename, codec="utf-8").read(), + "\u2022 hello\nthere") + self.assertEqual(os.path.exists(out.get_tempfile()), True) def test3(self): filename = _tmpdir + "/safefile" out = safefile.open(filename, "w", codec="utf-8") - out.write(u"\u2022 hello\nthere\nagain\n") + out.write("\u2022 hello\nthere\nagain\n") out.close() lines = safefile.open(filename, codec="utf-8").readlines() - self.assertEquals(lines, [u"\u2022 hello\n", - u"there\n", - u"again\n"]) + self.assertEqual(lines, ["\u2022 hello\n", + "there\n", + "again\n"]) lines = list(safefile.open(filename, codec="utf-8")) - self.assertEquals(lines, [u"\u2022 hello\n", - u"there\n", - u"again\n"]) + self.assertEqual(lines, ["\u2022 hello\n", + "there\n", + "again\n"]) def test4(self): @@ -78,13 +78,13 @@ def test4(self): out = safefile.open(filename, "w", codec="utf-8") - out.writelines([u"\u2022 hello\n", - u"there\n", - u"again\n"]) + out.writelines(["\u2022 hello\n", + "there\n", + "again\n"]) out.close() lines = safefile.open(filename, codec="utf-8").readlines() - self.assertEquals(lines, [u"\u2022 hello\n", - u"there\n", - u"again\n"]) + self.assertEqual(lines, ["\u2022 hello\n", + "there\n", + "again\n"]) diff --git a/tests/test_safefile.py.bak b/tests/test_safefile.py.bak new file mode 100644 index 000000000..1b11252eb --- /dev/null +++ b/tests/test_safefile.py.bak @@ -0,0 +1,90 @@ +import os +import unittest + +from keepnote import safefile + +from . import make_clean_dir, TMP_DIR + + +_tmpdir = os.path.join(TMP_DIR, 'safefile') + + +class TestCaseSafeFile (unittest.TestCase): + + def setUp(self): + make_clean_dir(_tmpdir) + + def test1(self): + """test successful write""" + + filename = _tmpdir + "/safefile" + + out = safefile.open(filename, "w", codec="utf-8") + tmp = out.get_tempfile() + + out.write(u"\u2022 hello\n") + out.write(u"there") + out.close() + + self.assertEquals(safefile.open(filename, codec="utf-8").read(), + u"\u2022 hello\nthere") + self.assertEquals(os.path.exists(tmp), False) + + def test2(self): + """test unsuccessful write""" + + filename = _tmpdir + "/safefile" + + # make file + self.test1() + + try: + out = safefile.open(filename, "w") + + out.write("hello2\n") + raise Exception("oops") + out.write("there2") + out.close() + except: + pass + + self.assertEquals(safefile.open(filename, codec="utf-8").read(), + u"\u2022 hello\nthere") + self.assertEquals(os.path.exists(out.get_tempfile()), True) + + def test3(self): + + filename = _tmpdir + "/safefile" + + out = safefile.open(filename, "w", codec="utf-8") + out.write(u"\u2022 hello\nthere\nagain\n") + out.close() + + lines = safefile.open(filename, codec="utf-8").readlines() + + self.assertEquals(lines, [u"\u2022 hello\n", + u"there\n", + u"again\n"]) + + lines = list(safefile.open(filename, codec="utf-8")) + + self.assertEquals(lines, [u"\u2022 hello\n", + u"there\n", + u"again\n"]) + + def test4(self): + + filename = _tmpdir + "/safefile" + + out = safefile.open(filename, "w", codec="utf-8") + + out.writelines([u"\u2022 hello\n", + u"there\n", + u"again\n"]) + out.close() + + lines = safefile.open(filename, codec="utf-8").readlines() + + self.assertEquals(lines, [u"\u2022 hello\n", + u"there\n", + u"again\n"]) diff --git a/wine-debug.sh b/wine-debug.sh old mode 100755 new mode 100644 index 2989f89db..02336986f --- a/wine-debug.sh +++ b/wine-debug.sh @@ -1,22 +1,5 @@ #!/bin/sh -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# + . ./wine-env.sh diff --git a/wine-env.sh b/wine-env.sh old mode 100755 new mode 100644 index c13f57599..ad51b3d81 --- a/wine-env.sh +++ b/wine-env.sh @@ -1,22 +1,5 @@ #!/bin/sh # -# KeepNote -# Copyright (c) 2008-2010 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# export WINEPREFIX=$HOME/sw/wine-keepnote diff --git a/wine.sh b/wine.sh old mode 100755 new mode 100644 index b7b5d779a..b6fe1d557 --- a/wine.sh +++ b/wine.sh @@ -1,22 +1,5 @@ #!/bin/sh -# -# KeepNote -# Copyright (c) 2008-2009 Matt Rasmussen -# Author: Matt Rasmussen -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# + . ./wine-env.sh echo WINEPREFIX=$WINEPREFIX