Hello community, here is the log from the commit of package rednotebook for openSUSE:Factory checked in at 2015-10-14 16:45:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rednotebook (Old) and /work/SRC/openSUSE:Factory/.rednotebook.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rednotebook" Changes: -------- --- /work/SRC/openSUSE:Factory/rednotebook/rednotebook.changes 2015-04-16 14:13:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rednotebook.new/rednotebook.changes 2015-10-14 16:45:42.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Oct 11 10:10:55 UTC 2015 - [email protected] + +- Update to version 1.10.2: + + Fix Chinese fonts in preview mode on Windows by using the fonts + mingliu and MS Mincho. + + Fix instructions for running RedNotebook on Windows. + + Move repository from launchpad to github. + +------------------------------------------------------------------- Old: ---- rednotebook-1.10.1.tar.gz New: ---- rednotebook-1.10.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rednotebook.spec ++++++ --- /var/tmp/diff_new_pack.pNi7Et/_old 2015-10-14 16:45:43.000000000 +0200 +++ /var/tmp/diff_new_pack.pNi7Et/_new 2015-10-14 16:45:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: rednotebook -Version: 1.10.1 +Version: 1.10.2 Release: 0 Summary: Graphical diary and journal License: GPL-3.0+ ++++++ rednotebook-1.10.1.tar.gz -> rednotebook-1.10.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/CHANGELOG new/rednotebook-1.10.2/CHANGELOG --- old/rednotebook-1.10.1/CHANGELOG 2015-04-14 23:37:23.000000000 +0200 +++ new/rednotebook-1.10.2/CHANGELOG 2015-08-24 13:21:34.000000000 +0200 @@ -1,3 +1,8 @@ +== 1.10.2 (2015-08-24) == +* Fix Chinese fonts in preview mode on Windows by using the fonts mingliu and MS Mincho (thanks Amos Ng). +* Fix instructions for running RedNotebook on Windows (thanks Amos Ng). +* Move repository from launchpad to github. + == 1.10.1 (2015-04-14) == * When undoing a formatting action, only remove formatting, not the text (lp:1326606). * Fix searching with enter for text with non-ASCII characters (lp:1430697). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/PKG-INFO new/rednotebook-1.10.2/PKG-INFO --- old/rednotebook-1.10.1/PKG-INFO 2015-04-14 23:37:24.000000000 +0200 +++ new/rednotebook-1.10.2/PKG-INFO 2015-08-24 13:21:34.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: rednotebook -Version: 1.10.1 +Version: 1.10.2 Summary: Graphical daily journal with calendar, templates and keyword searching Home-page: http://rednotebook.sourceforge.net Author: Jendrik Seipp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/README new/rednotebook-1.10.2/README --- old/rednotebook-1.10.1/README 2013-03-01 16:58:27.000000000 +0100 +++ new/rednotebook-1.10.2/README 2015-08-21 18:20:39.000000000 +0200 @@ -1,10 +1,27 @@ ===== Short Instructions ===== +=== Linux === + Install all dependencies, translate the application and run RedNotebook without installation: $ ./run +=== Windows === + +Install Python 2.7 (32-bit version), clone the repo, change into the +"win" directory, run + +C:\Users\you\rednotebook\win> python create-build-env.py + +and follow the instruction to add ``C:\gtkbin`` to your path. Now +change back into the rednotebook directory and run + +C:\Users\you\rednotebook> python rednotebook/journal.py + +Be sure to run using the **32-bit version** of Python! (Or else install +the 64-bit versions of the various dependencies required for the +project.) ===== Detailed Instructions ===== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/po/eo.po new/rednotebook-1.10.2/po/eo.po --- old/rednotebook-1.10.1/po/eo.po 2015-04-12 10:40:15.000000000 +0200 +++ new/rednotebook-1.10.2/po/eo.po 2015-06-30 10:13:23.000000000 +0200 @@ -8,14 +8,14 @@ "Project-Id-Version: rednotebook\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2013-11-16 21:33+0100\n" -"PO-Revision-Date: 2011-03-31 09:17+0000\n" -"Last-Translator: Michael Moroni <[email protected]>\n" +"PO-Revision-Date: 2015-04-18 03:46+0000\n" +"Last-Translator: Adolfo Jayme <[email protected]>\n" "Language-Team: Esperanto <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-01-09 05:39+0000\n" -"X-Generator: Launchpad (build 17298)\n" +"X-Launchpad-Export-Date: 2015-04-19 05:12+0000\n" +"X-Generator: Launchpad (build 17430)\n" #: ../rednotebook/backup.py:55 msgid "It has been a while since you made your last backup." @@ -52,7 +52,7 @@ #: ../rednotebook/gui/main_window.py:591 #: ../rednotebook/gui/customwidgets.py:375 msgid "Template" -msgstr "" +msgstr "Ŝablono" #: ../rednotebook/gui/main_window.py:593 msgid "" @@ -65,19 +65,19 @@ #: ../rednotebook/gui/format_menu.py:103 msgid "Bold" -msgstr "" +msgstr "Grase" #: ../rednotebook/gui/format_menu.py:105 msgid "Italic" -msgstr "" +msgstr "Kursive" #: ../rednotebook/gui/format_menu.py:107 msgid "Underline" -msgstr "" +msgstr "Substrekite" #: ../rednotebook/gui/format_menu.py:109 msgid "Strikethrough" -msgstr "" +msgstr "Trastrekite" #. ## Translators: Clear format #: ../rednotebook/gui/format_menu.py:112 @@ -87,12 +87,12 @@ #. ## Translators: Noun #: ../rednotebook/gui/format_menu.py:115 msgid "_Format" -msgstr "" +msgstr "_Formato" #. ## Translators: Noun #: ../rednotebook/gui/format_menu.py:131 ../rednotebook/gui/exports.py:401 msgid "Format" -msgstr "" +msgstr "Formato" #: ../rednotebook/gui/format_menu.py:132 msgid "Format the selected text or tag" @@ -122,7 +122,7 @@ #: ../rednotebook/gui/clouds.py:187 ../rednotebook/util/statistics.py:71 #: ../rednotebook/util/statistics.py:84 msgid "Words" -msgstr "" +msgstr "Vortoj" #: ../rednotebook/gui/clouds.py:246 #, python-format @@ -143,11 +143,11 @@ #: ../rednotebook/gui/exports.py:66 msgid "From:" -msgstr "" +msgstr "De:" #: ../rednotebook/gui/exports.py:68 msgid "To:" -msgstr "" +msgstr "Al:" #: ../rednotebook/gui/exports.py:115 msgid "Export currently selected text" @@ -277,11 +277,11 @@ #: ../rednotebook/gui/exports.py:421 msgid "Yes" -msgstr "" +msgstr "Jes" #: ../rednotebook/gui/exports.py:421 msgid "No" -msgstr "" +msgstr "Ne" #: ../rednotebook/gui/exports.py:470 ../rednotebook/gui/exports.py:476 #, python-format @@ -319,7 +319,7 @@ #. ## Translators: Verb #: ../rednotebook/gui/menu.py:109 msgid "Export" -msgstr "" +msgstr "Eksporti" #: ../rednotebook/gui/menu.py:110 msgid "Open the export assistant" @@ -328,7 +328,7 @@ #. ## Translators: Verb #: ../rednotebook/gui/menu.py:112 msgid "_Backup" -msgstr "" +msgstr "_Sekurkopii" #: ../rednotebook/gui/menu.py:113 msgid "Save all the data in a zip archive" @@ -348,7 +348,7 @@ #: ../rednotebook/gui/menu.py:120 msgid "_Edit" -msgstr "" +msgstr "_Redakti" #: ../rednotebook/gui/menu.py:122 msgid "Undo text or tag edits" @@ -464,24 +464,24 @@ #: ../rednotebook/gui/options.py:139 msgid "Day %j" -msgstr "" +msgstr "Tago %j" #: ../rednotebook/gui/options.py:144 msgid "Help" -msgstr "" +msgstr "Helpo" #. ## Translators: Noun #: ../rednotebook/gui/options.py:165 msgid "Preview:" -msgstr "" +msgstr "Antaŭrigardo:" #: ../rednotebook/gui/options.py:180 msgid "Choose font ..." -msgstr "" +msgstr "Elekti tiparo…" #: ../rednotebook/gui/options.py:188 msgid "Choose font" -msgstr "" +msgstr "Elekti tiparon" #: ../rednotebook/gui/options.py:270 msgid "Close to system tray" @@ -537,7 +537,7 @@ #: ../rednotebook/gui/search.py:76 msgid "Text" -msgstr "" +msgstr "Teksto" #: ../rednotebook/gui/insert_menu.py:67 msgid "First Item" @@ -557,7 +557,7 @@ #: ../rednotebook/gui/insert_menu.py:101 msgid "Picture" -msgstr "" +msgstr "Bildo" #: ../rednotebook/gui/insert_menu.py:102 msgid "Insert an image from the harddisk" @@ -565,7 +565,7 @@ #: ../rednotebook/gui/insert_menu.py:104 msgid "File" -msgstr "" +msgstr "Dosiero" #: ../rednotebook/gui/insert_menu.py:105 msgid "Insert a link to a file" @@ -574,7 +574,7 @@ #. ## Translators: Noun #: ../rednotebook/gui/insert_menu.py:108 msgid "_Link" -msgstr "" +msgstr "_Ligilo" #: ../rednotebook/gui/insert_menu.py:109 msgid "Insert a link to a website" @@ -586,11 +586,11 @@ #: ../rednotebook/gui/insert_menu.py:115 ../rednotebook/gui/insert_menu.py:309 msgid "Title" -msgstr "" +msgstr "Titolo" #: ../rednotebook/gui/insert_menu.py:117 msgid "Line" -msgstr "" +msgstr "Linio" #: ../rednotebook/gui/insert_menu.py:118 msgid "Insert a separator line" @@ -630,7 +630,7 @@ #: ../rednotebook/gui/insert_menu.py:197 msgid "pixels" -msgstr "" +msgstr "bilderoj" #: ../rednotebook/gui/insert_menu.py:217 msgid "Width must be an integer." @@ -650,11 +650,11 @@ #: ../rednotebook/gui/categories.py:410 msgid "Add a new entry" -msgstr "" +msgstr "Aldoni novan elementon" #: ../rednotebook/gui/categories.py:412 msgid "Delete this entry" -msgstr "" +msgstr "Forigi tiun eron" #: ../rednotebook/journal.py:215 msgid "Opening default journal." @@ -675,7 +675,7 @@ #: ../rednotebook/journal.py:468 msgid "Error" -msgstr "" +msgstr "Eraro" #: ../rednotebook/info.py:98 msgid "Work" @@ -812,31 +812,31 @@ #: ../rednotebook/templates.py:28 msgid "Monday" -msgstr "" +msgstr "lundo" #: ../rednotebook/templates.py:28 msgid "Tuesday" -msgstr "" +msgstr "mardo" #: ../rednotebook/templates.py:28 msgid "Wednesday" -msgstr "" +msgstr "merkredo" #: ../rednotebook/templates.py:28 msgid "Thursday" -msgstr "" +msgstr "ĵaŭdo" #: ../rednotebook/templates.py:29 msgid "Friday" -msgstr "" +msgstr "vendredo" #: ../rednotebook/templates.py:29 msgid "Saturday" -msgstr "" +msgstr "sabato" #: ../rednotebook/templates.py:29 msgid "Sunday" -msgstr "" +msgstr "dimanĉo" #: ../rednotebook/templates.py:108 msgid "" @@ -924,7 +924,7 @@ #: ../rednotebook/templates.py:381 msgid "Create New Template" -msgstr "" +msgstr "Krei novan ŝablonon" #: ../rednotebook/util/dates.py:56 msgid "Incorrect date format" @@ -940,7 +940,7 @@ #: ../rednotebook/util/statistics.py:74 ../rednotebook/util/statistics.py:86 msgid "Letters" -msgstr "" +msgstr "Literoj" #: ../rednotebook/util/statistics.py:75 msgid "Days between first and last Entry" @@ -956,11 +956,11 @@ #: ../rednotebook/util/statistics.py:85 msgid "Lines" -msgstr "" +msgstr "Linioj" #: ../rednotebook/util/utils.py:114 msgid "unknown" -msgstr "" +msgstr "nekonata" #: ../rednotebook/util/utils.py:129 #, python-format @@ -990,7 +990,7 @@ #: tmp/main_window.glade.h:3 msgid "Today" -msgstr "" +msgstr "Hodiaŭ" #: tmp/main_window.glade.h:4 msgid "Go to next day (Ctrl+PageDown)" @@ -1021,6 +1021,7 @@ msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" +" Adolfo Jayme https://launchpad.net/~fitojb\n"; " Michael Moroni https://launchpad.net/~airon90"; #: tmp/main_window.glade.h:14 @@ -1045,7 +1046,7 @@ #: tmp/main_window.glade.h:19 msgid "Select a file" -msgstr "" +msgstr "Elektu dosieron" #: tmp/main_window.glade.h:20 msgid "Insert Link" @@ -1065,21 +1066,21 @@ #: tmp/main_window.glade.h:24 msgid "Preferences" -msgstr "" +msgstr "Preferoj" #. ## Refers to the part of the options dialog where the user can select the "General/Overall" Settings #: tmp/main_window.glade.h:26 msgid "<b>General</b>" -msgstr "" +msgstr "<b>Ĝenerale</b>" #. ## Refers to the part of the options dialog where the user can select the "General/Overall" Settings #: tmp/main_window.glade.h:28 msgid "General" -msgstr "" +msgstr "Ĝenerale" #: tmp/main_window.glade.h:29 msgid "Statistics" -msgstr "" +msgstr "Statistikoj" #: tmp/main_window.glade.h:30 msgid "<b>Selected Day</b>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/rednotebook/configuration.py new/rednotebook-1.10.2/rednotebook/configuration.py --- old/rednotebook-1.10.1/rednotebook/configuration.py 2014-12-28 00:02:49.000000000 +0100 +++ new/rednotebook-1.10.2/rednotebook/configuration.py 2015-08-21 21:13:05.000000000 +0200 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # ----------------------------------------------------------------------- -# Copyright (c) 2009, 2014 Jendrik Seipp +# Copyright (c) 2009, 2014, 2015 Jendrik Seipp # # RedNotebook is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,40 +20,59 @@ import os import logging +from rednotebook.gui import editor from rednotebook.util import filesystem - def delete_comment(line): if line.startswith('#'): return u'' return line - class Config(dict): + defaults = { + 'mainFont': editor.DEFAULT_FONT, + # mingliu and MS Mincho are required for displaying Asian fonts + # in preview mode on Windows. + 'previewFont': 'Ubuntu, mingliu, MS Mincho, sans-serif', + 'closeToTray': 0, + 'checkForNewVersion': 0, + 'weekNumbers': 0, + 'portable': 0, + 'userDir': '', + 'firstStart': 1, + 'spellcheck': 0, + 'mainFrameWidth': 1024, + 'mainFrameHeight': 700, + 'mainFrameMaximized': 0, + 'mainFrameX': None, + 'mainFrameY': None, + 'leftDividerPosition': 250, + 'rightDividerPosition': None, + } + + obsolete_keys = set([ + u'useGTKMozembed', u'useWebkit', u'LD_LIBRARY_PATH', + u'MOZILLA_FIVE_HOME', u'cloudTabActive', u'mainFontSize', + u'running' + ]) + + # Allow changing the value of portable only in default.cfg. + suppressed_keys = set(['portable', 'user_dir']) + def __init__(self, config_file): dict.__init__(self) self.filename = config_file - self.obsolete_keys = [ - u'useGTKMozembed', u'useWebkit', u'LD_LIBRARY_PATH', - u'MOZILLA_FIVE_HOME', u'cloudTabActive', u'mainFontSize', - u'running'] - - # Allow changing the value of portable only in default.cfg - self.suppressed_keys = ['portable', 'user_dir'] - self.update(self._read_file(self.filename)) self.save_state() - def save_state(self): ''' Save a copy of the dir to check for changes later ''' self.old_config = self.copy() - def _read_file(self, filename): content = filesystem.read_file(filename) @@ -80,13 +99,17 @@ return dictionary + def read(self, key, default=None): + ''' + Get the stored value for the given key. - def read(self, key, default): - if key in self: - return self[key] - self[key] = default - return default - + If *default* is omitted, there must be a default for *key* in + Config.defaults. If *default* is given and there is no value + stored for *key*, set the stored value to *default*. + ''' + if default is None: + default = self.defaults[key] + return self.setdefault(key, default) def read_list(self, key, default): ''' @@ -106,15 +129,12 @@ strings = [s.strip() for s in string.split()] return [s for s in strings if s] - def write_list(self, key, list): self[key] = ', '.join(list) - def changed(self): return not (self == self.old_config) - def save_to_disk(self): if not self.changed(): return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/rednotebook/gui/clouds.py new/rednotebook-1.10.2/rednotebook/gui/clouds.py --- old/rednotebook-1.10.1/rednotebook/gui/clouds.py 2014-12-24 13:11:51.000000000 +0100 +++ new/rednotebook-1.10.2/rednotebook/gui/clouds.py 2015-08-21 19:57:46.000000000 +0200 @@ -187,7 +187,7 @@ def get_clouds(self, word_counter, tag_counter): tag_cloud = self._get_cloud_body(tag_counter) word_cloud = self._get_cloud_body(word_counter) - font = self.journal.config.read('previewFont', 'Ubuntu, sans-serif') + font = self.journal.config.read('previewFont') heading = '<h1> %s</h1>' parts = ['<html><head>', CLOUD_CSS % locals(), '</head>', '<body>'] if tag_cloud: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/rednotebook/gui/main_window.py new/rednotebook-1.10.2/rednotebook/gui/main_window.py --- old/rednotebook-1.10.1/rednotebook/gui/main_window.py 2015-04-12 10:58:18.000000000 +0200 +++ new/rednotebook-1.10.2/rednotebook/gui/main_window.py 2015-08-21 20:57:30.000000000 +0200 @@ -39,7 +39,6 @@ from rednotebook.gui import browser from rednotebook.gui import search from rednotebook.gui.editor import Editor -from rednotebook.gui import editor from rednotebook.gui.clouds import Cloud from rednotebook.gui import insert_menu from rednotebook.gui import format_menu @@ -100,7 +99,7 @@ self.undo_redo_manager) self.day_text_field.day_text_view.grab_focus() can_spell_check = self.day_text_field.can_spell_check() - spell_check_enabled = bool(self.journal.config.read('spellcheck', 0)) + spell_check_enabled = bool(self.journal.config.read('spellcheck')) for actiongroup in self.menubar_manager.uimanager.get_action_groups(): if actiongroup.get_name() == 'MainMenuActionGroup': for action in actiongroup.list_actions(): @@ -247,7 +246,7 @@ def setup_tray_icon(self): self.tray_icon = gtk.StatusIcon() - visible = (self.journal.config.read('closeToTray', 0) == 1) + visible = (self.journal.config.read('closeToTray') == 1) self.tray_icon.set_visible(visible) logging.debug('Tray icon visible: %s' % visible) @@ -315,7 +314,7 @@ ''' logging.debug('Main frame destroyed') - if self.journal.config.read('closeToTray', 0): + if self.journal.config.read('closeToTray'): self.hide() else: self.journal.exit() @@ -544,8 +543,8 @@ def load_values_from_config(self): config = self.journal.config - main_frame_width = config.read('mainFrameWidth', 1024) - main_frame_height = config.read('mainFrameHeight', 700) + main_frame_width = config.read('mainFrameWidth') + main_frame_height = config.read('mainFrameHeight') screen_width = gtk.gdk.screen_width() screen_height = gtk.gdk.screen_height() @@ -555,12 +554,12 @@ self.main_frame.resize(main_frame_width, main_frame_height) - if config.read('mainFrameMaximized', 0): + if config.read('mainFrameMaximized'): self.main_frame.maximize() else: # If window is not maximized, restore last position - x = config.read('mainFrameX', None) - y = config.read('mainFrameY', None) + x = config.read('mainFrameX') + y = config.read('mainFrameY') try: x, y = int(x), int(y) # Set to 0 if value is below 0 @@ -572,11 +571,11 @@ # Values have not been set or are not valid integers self.main_frame.set_position(gtk.WIN_POS_CENTER) - self.builder.get_object('main_pane').set_position(config.read('leftDividerPosition', 250)) + self.builder.get_object('main_pane').set_position(config.read('leftDividerPosition')) # By default do not show tags pane. self.edit_pane.set_position(config.read('rightDividerPosition', main_frame_width)) - self.set_font(config.read('mainFont', editor.DEFAULT_FONT)) + self.set_font(config.read('mainFont')) def set_font(self, font_name): self.day_text_field.set_font(font_name) @@ -818,7 +817,7 @@ self.journal = journal self.calendar = calendar - week_numbers = self.journal.config.read('weekNumbers', 0) + week_numbers = self.journal.config.read('weekNumbers') if week_numbers: calendar.set_property('show-week-numbers', True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/rednotebook/gui/options.py new/rednotebook-1.10.2/rednotebook/gui/options.py --- old/rednotebook-1.10.1/rednotebook/gui/options.py 2014-12-26 00:02:13.000000000 +0100 +++ new/rednotebook-1.10.2/rednotebook/gui/options.py 2015-08-21 19:57:46.000000000 +0200 @@ -28,6 +28,7 @@ from rednotebook.gui import editor from rednotebook.util import filesystem, utils, dates from rednotebook import info +from rednotebook.configuration import Config class Option(gtk.HBox): @@ -290,7 +291,7 @@ # Use separate fonts since the preview often doesn't support the edit font. FontOption(_('Edit font:'), 'mainFont'), TextOption(_('Preview font:'), 'previewFont', - default='Ubuntu, sans-serif', + default=Config.defaults['previewFont'], tooltip=_('Comma-separated font names')), DateFormatOption(_('Date/Time format'), 'dateTimeString'), TextOption(_('Exclude from cloud'), 'cloudIgnoreList', @@ -311,11 +312,11 @@ self.main_window.cloud.update_lists() self.main_window.cloud.update(force_update=True) - visible = (self.config.read('closeToTray', 0) == 1) + visible = (self.config.read('closeToTray') == 1) self.main_window.tray_icon.set_visible(visible) else: # Reset some options - self.main_window.set_font(self.config.read('mainFont', editor.DEFAULT_FONT)) + self.main_window.set_font(self.config.read('mainFont')) self.dialog.hide() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/rednotebook/info.py new/rednotebook-1.10.2/rednotebook/info.py --- old/rednotebook-1.10.1/rednotebook/info.py 2015-04-14 23:37:15.000000000 +0200 +++ new/rednotebook-1.10.2/rednotebook/info.py 2015-08-24 13:21:19.000000000 +0200 @@ -30,7 +30,7 @@ from rednotebook.external import argparse -version = '1.10.1' +version = '1.10.2' author = 'Jendrik Seipp' author_mail = '[email protected]' url = 'http://rednotebook.sourceforge.net' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/rednotebook/journal.py new/rednotebook-1.10.2/rednotebook/journal.py --- old/rednotebook-1.10.1/rednotebook/journal.py 2015-04-12 12:38:50.000000000 +0200 +++ new/rednotebook-1.10.2/rednotebook/journal.py 2015-08-21 19:57:46.000000000 +0200 @@ -186,7 +186,7 @@ self.title = '' # show instructions at first start - self.is_first_start = self.config.read('firstStart', 1) + self.is_first_start = self.config.read('firstStart') self.config['firstStart'] = 0 logging.info('First Start: %s' % bool(self.is_first_start)) @@ -214,7 +214,7 @@ #self.archiver.check_last_backup_date() # Check for a new version - if self.config.read('checkForNewVersion', 0) == 1: + if self.config.read('checkForNewVersion') == 1: utils.check_new_version(self, info.version, startup=True) # Automatically save the content after a period of time @@ -285,7 +285,7 @@ def convert(self, text, target, headers=None, options=None): options = options or {} - options['font'] = self.config.read('previewFont', 'Ubuntu, sans-serif') + options['font'] = self.config.read('previewFont') return markup.convert(text, target, self.dirs.data_dir, headers=headers, options=options) def save_to_disk(self, exit_imminent=False, changing_journal=False, saveas=False): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.10.1/rednotebook/util/filesystem.py new/rednotebook-1.10.2/rednotebook/util/filesystem.py --- old/rednotebook-1.10.1/rednotebook/util/filesystem.py 2015-04-14 21:12:43.000000000 +0200 +++ new/rednotebook-1.10.2/rednotebook/util/filesystem.py 2015-08-21 19:57:46.000000000 +0200 @@ -78,7 +78,7 @@ self[key] = value setattr(self, key, value) - self.portable = bool(config.read('portable', 0)) + self.portable = bool(config.read('portable')) self.journal_user_dir = self.get_user_dir(config) @@ -96,7 +96,7 @@ def get_user_dir(self, config): - custom = config.read('userDir', '') + custom = config.read('userDir') if custom: # If a custom user dir has been set,
