Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package Setzer for openSUSE:Factory checked
in at 2023-10-25 18:05:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Setzer (Old)
and /work/SRC/openSUSE:Factory/.Setzer.new.24901 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Setzer"
Wed Oct 25 18:05:21 2023 rev:5 rq:1120315 version:61
Changes:
--------
--- /work/SRC/openSUSE:Factory/Setzer/Setzer.changes 2023-10-02
20:08:54.764083048 +0200
+++ /work/SRC/openSUSE:Factory/.Setzer.new.24901/Setzer.changes 2023-10-25
18:06:07.001089962 +0200
@@ -1,0 +2,6 @@
+Tue Oct 24 05:12:35 UTC 2023 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Update to version 61:
+ * Show app's name in system monitor.
+
+-------------------------------------------------------------------
Old:
----
Setzer-60.tar.gz
New:
----
Setzer-61.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Setzer.spec ++++++
--- /var/tmp/diff_new_pack.IiMcgd/_old 2023-10-25 18:06:07.737114715 +0200
+++ /var/tmp/diff_new_pack.IiMcgd/_new 2023-10-25 18:06:07.741114850 +0200
@@ -17,7 +17,7 @@
Name: Setzer
-Version: 60
+Version: 61
Release: 0
Summary: Simple yet full-featured LaTeX editor for GTK/GNOME
License: GPL-3.0-or-later
++++++ Setzer-60.tar.gz -> Setzer-61.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/data/org.cvfosammmm.Setzer.metainfo.xml.in
new/Setzer-61/data/org.cvfosammmm.Setzer.metainfo.xml.in
--- old/Setzer-60/data/org.cvfosammmm.Setzer.metainfo.xml.in 2023-09-21
10:49:07.000000000 +0200
+++ new/Setzer-61/data/org.cvfosammmm.Setzer.metainfo.xml.in 2023-10-23
10:54:56.000000000 +0200
@@ -64,6 +64,11 @@
</requires>
<releases>
+ <release version="61" date="2023-10-23">
+ <description translatable="no">
+ <p>Show app's name in system monitor, ...</p>
+ </description>
+ </release>
<release version="60" date="2023-9-21">
<description translatable="no">
<p>Themes and recoloring, ...</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/data/resources/style_gtk.css
new/Setzer-61/data/resources/style_gtk.css
--- old/Setzer-60/data/resources/style_gtk.css 2023-09-21 10:49:07.000000000
+0200
+++ new/Setzer-61/data/resources/style_gtk.css 2023-10-23 10:54:56.000000000
+0200
@@ -3,7 +3,7 @@
*/
box.document textview {
- line-height: 1;
+ line-height: 1.1;
}
button.new-document-menu-button {
padding-left: 8px;
@@ -12,6 +12,12 @@
scrollbar.hidden slider {
opacity: 0;
}
+headerbar > windowhandle > box {
+ padding: 0px;
+}
+headerbar box.start, headerbar box.end {
+ padding: 6px;
+}
/*
** welcome-screen
@@ -72,17 +78,15 @@
padding-right: 18px;
border-radius: 0px;
box-shadow: none;
- transition: none;
- text-shadow: none;
font-weight: normal;
+ border-left: 1px solid transparent;
+ border-right: 1px solid transparent;
}
.open-docs-popover-button > button:hover:not(:checked):not(:active) {
- background: none;
border-left: 1px solid @borders;
border-right: 1px solid @borders;
}
.open-docs-popover-button > button:checked, .open-docs-popover-button >
button:active {
- background: @borders;
border-left: 1px solid @borders;
border-right: 1px solid @borders;
}
@@ -201,6 +205,10 @@
color: @menu_shortcut_color;
margin-left: 18px;
}
+popover button image.icon {
+ padding-top: 2px;
+ padding-right: 8px;
+}
popover separator {
margin: 6px 0px;
}
@@ -231,15 +239,15 @@
padding-bottom: 1px;
}
.sidebar box.tabs-box > label {
- padding: 9px 8px 8px 9px;
+ padding: 1px 0px 0px 9px;
background-color: @view_bg_color;
}
.sidebar box.tabs-box button {
- margin: 0px;
- padding: 6px;
border-width: 0px;
- border-radius: 0px;
+ margin: 0px;
box-shadow: none;
+ border-radius: 0px;
+ padding: 6px;
}
box.sidebar-symbols {
background-color: @view_bg_color;
@@ -316,21 +324,11 @@
border-radius: 0px;
padding: 6px;
}
-popover button image.icon {
- padding-top: 2px;
- padding-right: 8px;
-}
-popover.menu-own-quotes-symbolic {
- margin-left: 0px;
-}
/*
** preview
*/
-box.preview scrolledwindow {
- background-color: @view_bg_color;
-}
box.preview > box {
background-color: @view_bg_color;
border-bottom: 1px solid @lighter_border;
@@ -379,12 +377,6 @@
margin-left: 50px;
margin-right: 55px;
}
-paned > paned.hidden-separator separator {
- padding: 0px;
-}
-paned > paned.visible-separator separator {
- padding: 4px;
-}
/*
** help
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/meson.build new/Setzer-61/meson.build
--- old/Setzer-60/meson.build 2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/meson.build 2023-10-23 10:54:56.000000000 +0200
@@ -1,14 +1,17 @@
project(
'Setzer',
- version: '60',
+ version: '61',
license: 'GPL-3.0-or-later',
)
+python = import('python').find_installation()
+python_bin = python.full_path()
+
# configure folders
prefix = get_option('prefix')
bindir = get_option('bindir')
datadir = get_option('datadir')
-pymdir = import('python').find_installation().get_install_dir()
+pymdir = python.get_install_dir()
resourcesdir = join_paths(datadir, 'Setzer')
localedir = get_option('localedir')
mandir = get_option('mandir')
@@ -18,6 +21,7 @@
config.set('localedir_path', join_paths(prefix, localedir))
config.set('resources_path', join_paths(prefix, resourcesdir, 'resources'))
config.set('app_icons_path', join_paths(prefix, datadir, 'icons'))
+config.set('python_path', python_bin)
config_dev = config
config_dev.set('localedir_path', '/tmp/usr/share/locale') # this is a
workaround
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/org.cvfosammmm.Setzer.json
new/Setzer-61/org.cvfosammmm.Setzer.json
--- old/Setzer-60/org.cvfosammmm.Setzer.json 2023-09-21 10:49:07.000000000
+0200
+++ new/Setzer-61/org.cvfosammmm.Setzer.json 2023-10-23 10:54:56.000000000
+0200
@@ -157,17 +157,28 @@
]
},
{
- "name": "python3-numpy",
+ "name": "numpy",
"buildsystem": "simple",
"build-commands": [
- "pip3 install --verbose --exists-action=i --no-index
--find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"numpy\"
--no-build-isolation"
+ "pip3 install --no-build-isolation --no-index
--find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} numpy"
],
"sources": [
{
"type": "file",
- "url":
"https://files.pythonhosted.org/packages/55/b3/b13bce39ba82b7398c06d10446f5ffd5c07db39b09bd37370dc720c7951c/numpy-1.26.0.tar.gz";,
- "sha256":
"f93fc78fe8bf15afe2b8d6b6499f1c73953169fad1e9a8dd086cdff3190e7fdf"
- }
+ "url":
"https://files.pythonhosted.org/packages/a0/41/8f53eff8e969dd8576ddfb45e7ed315407d27c7518ae49418be8ed532b07/numpy-1.25.2.tar.gz";,
+ "sha256":
"fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760",
+ "x-checker-data": {
+ "type": "pypi",
+ "name": "numpy"
+ }
+ }
+ ],
+ "cleanup": [
+ "/bin",
+ "/lib/python3.*/site-packages/numpy/core/include",
+ "/lib/python3.*/site-packages/numpy/core/lib/libnpymath.a",
+ "/lib/python3.*/site-packages/numpy/tests",
+ "/lib/python3.*/site-packages/numpy/*/tests"
]
},
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/setzer/app/font_manager.py
new/Setzer-61/setzer/app/font_manager.py
--- old/Setzer-60/setzer/app/font_manager.py 2023-09-21 10:49:07.000000000
+0200
+++ new/Setzer-61/setzer/app/font_manager.py 2023-10-23 10:54:56.000000000
+0200
@@ -54,13 +54,20 @@
return char_width
def get_line_height(text_view):
- context = text_view.get_pango_context()
- layout = Pango.Layout.new(context)
- layout.set_text('A', -1)
- char_width, line_height_1 = layout.get_pixel_size()
- layout.set_text('A\nA', -1)
- char_width, line_height_2 = layout.get_pixel_size()
- return line_height_2 - line_height_1
+ count_iter = text_view.get_buffer().get_start_iter()
+ offset_before = 0
+ count = 1
+ while True:
+ offset_before = count_iter.get_offset()
+ text_view.forward_display_line(count_iter)
+ count += 1
+ if count_iter.get_offset() == offset_before and offset_before != 0:
+ count -= 2
+ break
+ if count_iter.get_offset() == offset_before or
count_iter.get_line() != 0:
+ count -= 1
+ break
+ return
text_view.get_line_yrange(text_view.get_buffer().get_start_iter()).height /
count
def get_font_desc():
return Pango.FontDescription.from_string(FontManager.font_string)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/dialogs/close_confirmation/close_confirmation.py
new/Setzer-61/setzer/dialogs/close_confirmation/close_confirmation.py
--- old/Setzer-60/setzer/dialogs/close_confirmation/close_confirmation.py
2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/dialogs/close_confirmation/close_confirmation.py
2023-10-23 10:54:56.000000000 +0200
@@ -56,7 +56,8 @@
if len(documents) == 1:
selected_documents.append(documents[0])
else:
- for child in self.chooser.get_children():
+ for i in range(0, len(documents)):
+ child = self.chooser.get_row_at_index(i)
if child.get_child().get_active():
number = int(child.get_child().get_name()[29:])
selected_documents.append(documents[number])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/dialogs/replace_confirmation/replace_confirmation.py
new/Setzer-61/setzer/dialogs/replace_confirmation/replace_confirmation.py
--- old/Setzer-60/setzer/dialogs/replace_confirmation/replace_confirmation.py
2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/dialogs/replace_confirmation/replace_confirmation.py
2023-10-23 10:54:56.000000000 +0200
@@ -26,16 +26,21 @@
def __init__(self, main_window):
self.main_window = main_window
+ self.search_context = None
+ self.replacement = None
- def run(self, original, replacement, number_of_occurrences):
+ def run(self, original, replacement, number_of_occurrences,
search_context):
+ self.search_context = search_context
+ self.replacement = replacement
self.setup(original, replacement, number_of_occurrences)
- response = self.view.run()
- if response == Gtk.ResponseType.YES:
- return_value = True
- else:
- return_value = False
+
+ self.view.show()
+ self.signal_connection_id = self.view.connect('response',
self.process_response)
+
+ def process_response(self, view, response_id):
+ if response_id == Gtk.ResponseType.YES:
+ self.search_context.replace_all(self.replacement, -1)
self.close()
- return return_value
def close(self):
self.view.hide()
@@ -43,11 +48,14 @@
del(self.view)
def setup(self, original, replacement, number_of_occurrences):
- self.view = Gtk.MessageDialog(self.main_window, 0,
Gtk.MessageType.QUESTION)
+ self.view = Gtk.MessageDialog()
+ self.view.set_transient_for(self.main_window)
+ self.view.set_modal(True)
+ self.view.set_property('message-type', Gtk.MessageType.QUESTION)
str_occurrences = ngettext('Replacing {amount} occurence of
»{original}« with »{replacement}«.', 'Replacing {amount} occurrences of
»{original}« with »{replacement}«.', number_of_occurrences)
self.view.set_property('text',
str_occurrences.format(amount=str(number_of_occurrences), original=original,
replacement=replacement))
- self.view.format_secondary_markup(_('Do you really want to do this?'))
+ self.view.set_property('secondary-text', _('Do you really want to do
this?'))
self.view.add_buttons(_('_Cancel'), Gtk.ResponseType.CANCEL, _('_Yes,
replace all occurrences'), Gtk.ResponseType.YES)
self.view.set_default_response(Gtk.ResponseType.YES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/document/autocomplete/autocomplete.py
new/Setzer-61/setzer/document/autocomplete/autocomplete.py
--- old/Setzer-60/setzer/document/autocomplete/autocomplete.py 2023-09-21
10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/document/autocomplete/autocomplete.py 2023-10-23
10:54:56.000000000 +0200
@@ -117,6 +117,38 @@
elif self.selected_item_index >= self.first_item_index + 5:
self.first_item_index = self.selected_item_index - 4
+ def page_down(self):
+ s_index = self.selected_item_index
+ f_index = self.first_item_index
+ page_size = min(len(self.items), 5)
+ length = len(self.items)
+
+ if s_index < length - page_size:
+ self.selected_item_index += page_size
+ else:
+ self.selected_item_index = length - 1
+
+ if f_index < length - 2 * page_size + 1:
+ self.first_item_index += page_size
+ elif f_index < length - page_size:
+ self.first_item_index = length - page_size
+
+ def page_up(self):
+ s_index = self.selected_item_index
+ f_index = self.first_item_index
+ page_size = min(len(self.items), 5)
+ length = len(self.items)
+
+ if s_index >= page_size:
+ self.selected_item_index -= page_size
+ else:
+ self.selected_item_index = 0
+
+ if f_index >= page_size:
+ self.first_item_index -= page_size
+ else:
+ self.first_item_index = 0
+
def tab(self):
# If the selected item matches the beginning of the end of the
# current line in the buffer in full, just like on submit,
@@ -245,6 +277,7 @@
self.source_buffer.end_user_action()
if char == '\\':
self.cursor_unchanged_after_autoclosing_bracket = True
+ return True
def jump_over_closing_bracket(self):
chars_at_cursor = self.document.get_chars_at_cursor(2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/document/autocomplete/autocomplete_controller.py
new/Setzer-61/setzer/document/autocomplete/autocomplete_controller.py
--- old/Setzer-60/setzer/document/autocomplete/autocomplete_controller.py
2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/document/autocomplete/autocomplete_controller.py
2023-10-23 10:54:56.000000000 +0200
@@ -96,6 +96,20 @@
self.autocomplete.widget.queue_draw()
return True
+ if keyval == Gdk.keyval_from_name('Page_Down'):
+ if state & modifiers == 0:
+ if self.autocomplete.is_active:
+ self.autocomplete.page_down()
+ self.autocomplete.widget.queue_draw()
+ return True
+
+ if keyval == Gdk.keyval_from_name('Page_Up'):
+ if state & modifiers == 0:
+ if self.autocomplete.is_active:
+ self.autocomplete.page_up()
+ self.autocomplete.widget.queue_draw()
+ return True
+
if not self.autocomplete.is_active:
if keyval == Gdk.keyval_from_name('bracketleft'):
self.autocomplete.autoclose_brackets('[')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/document/autocomplete/autocomplete_widget.py
new/Setzer-61/setzer/document/autocomplete/autocomplete_widget.py
--- old/Setzer-60/setzer/document/autocomplete/autocomplete_widget.py
2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/document/autocomplete/autocomplete_widget.py
2023-10-23 10:54:56.000000000 +0200
@@ -39,16 +39,30 @@
self.height = None
self.shortcutsbar_height = None
self.x_position, self.y_position = (None, None)
+ self.focus_hide = self.model.document.source_view.has_focus()
+
+ self.focus_controller = Gtk.EventControllerFocus()
+ self.focus_controller.connect('enter', self.on_focus_in)
+ self.focus_controller.connect('leave', self.on_focus_out)
+ self.model.document.source_view.add_controller(self.focus_controller)
self.view.set_draw_func(self.view.draw)
self.queue_draw()
+ def on_focus_out(self, widget):
+ self.focus_hide = True
+ self.queue_draw()
+
+ def on_focus_in(self, widget):
+ self.focus_hide = False
+ self.queue_draw()
+
def queue_draw(self):
self.update_size()
self.update_position()
self.update_margins()
- if not self.model.is_active or not self.position_is_visible():
+ if not self.model.is_active or not self.position_is_visible() or
self.focus_hide:
self.view.hide()
else:
self.view.show()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/setzer/document/gutter/gutter.py
new/Setzer-61/setzer/document/gutter/gutter.py
--- old/Setzer-60/setzer/document/gutter/gutter.py 2023-09-21
10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/document/gutter/gutter.py 2023-10-23
10:54:56.000000000 +0200
@@ -267,11 +267,11 @@
ctx.fill()
Gdk.cairo_set_source_rgba(ctx,
ColorManager.get_ui_color('view_fg_color'))
- if offset < 0: offset -= 1
- offset = int(offset)
+ self.layout.set_markup(text)
+
+ offset += (self.line_height -
self.layout.get_extents().logical_rect.height / Pango.SCALE) / 2 + 1
ctx.move_to(0, offset)
- self.layout.set_markup(text)
PangoCairo.show_layout(ctx, self.layout)
def draw_folding_region(self, ctx, line, is_current, offset):
@@ -289,27 +289,28 @@
xoff7 = 11 * self.char_width / 8
xoff8 = 16 * self.char_width / 8
xoff9 = 26 * self.char_width / 11
- yoff1 = 1.75 * self.line_height / 8
- yoff2 = 4.25 * self.line_height / 8
- yoff3 = 6.75 * self.line_height / 8
- yoff4 = 2.5 * self.line_height / 6
- yoff5 = 4 * self.line_height / 6
- len1 = 4 * self.char_width / 11
+ yoff1 = 0
+ yoff2 = 2.5 * self.char_width / 4
+ yoff3 = 5 * self.char_width / 4
+ yoff4 = 0
+ yoff5 = 1 * self.char_width / 2
+ line_gap_folded = ((self.line_height - self.char_width * 5 / 4) / 2)
+ line_gap_unfolded = ((self.line_height - self.char_width * 1 / 2) / 2)
if folding_region['is_folded']:
- ctx.move_to(self.line_numbers_width + xoff1, offset + yoff1)
- ctx.line_to(self.line_numbers_width + xoff2, offset + yoff2)
- ctx.line_to(self.line_numbers_width + xoff1, offset + yoff3)
- ctx.line_to(self.line_numbers_width + xoff1, offset + yoff1)
+ ctx.move_to(self.line_numbers_width + xoff1, offset +
line_gap_folded + 0.5)
+ ctx.line_to(self.line_numbers_width + xoff2, offset +
line_gap_folded + yoff2 + 0.5)
+ ctx.line_to(self.line_numbers_width + xoff1, offset +
line_gap_folded + yoff3 + 0.5)
+ ctx.line_to(self.line_numbers_width + xoff1, offset +
line_gap_folded + 0.5)
ctx.fill()
for i in range(4):
ctx.rectangle(self.line_numbers_width + (i + 0.5) *
self.char_width, offset + self.line_height, self.char_width / 2, 1)
ctx.fill()
else:
- ctx.move_to(self.line_numbers_width + xoff6, offset + yoff4 + 0.5)
- ctx.line_to(self.line_numbers_width + xoff7, offset + yoff5 + 0.5)
- ctx.line_to(self.line_numbers_width + xoff8, offset + yoff4 + 0.5)
- ctx.line_to(self.line_numbers_width + xoff6, offset + yoff4 + 0.5)
+ ctx.move_to(self.line_numbers_width + xoff6, offset +
line_gap_unfolded)
+ ctx.line_to(self.line_numbers_width + xoff7, offset +
line_gap_unfolded + yoff5)
+ ctx.line_to(self.line_numbers_width + xoff8, offset +
line_gap_unfolded)
+ ctx.line_to(self.line_numbers_width + xoff6, offset +
line_gap_unfolded)
ctx.fill()
def draw_hovered_folding_region(self, ctx):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/document/preview/preview_controller.py
new/Setzer-61/setzer/document/preview/preview_controller.py
--- old/Setzer-60/setzer/document/preview/preview_controller.py 2023-09-21
10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/document/preview/preview_controller.py 2023-10-23
10:54:56.000000000 +0200
@@ -17,9 +17,7 @@
import gi
gi.require_version('Gtk', '4.0')
-gi.require_version('Poppler', '0.18')
from gi.repository import Gdk
-from gi.repository import Poppler
import webbrowser, math
import _thread as thread
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/document/preview/preview_presenter.py
new/Setzer-61/setzer/document/preview/preview_presenter.py
--- old/Setzer-60/setzer/document/preview/preview_presenter.py 2023-09-21
10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/document/preview/preview_presenter.py 2023-10-23
10:54:56.000000000 +0200
@@ -71,12 +71,12 @@
def show_blank_slate(self):
self.view.stack.set_visible_child_name('blank_slate')
self.view.external_viewer_button.set_sensitive(False)
- self.view.external_viewer_button_revealer.set_reveal_child(False)
+ self.view.preview_button_revealer.set_reveal_child(False)
def show_pdf(self):
self.view.stack.set_visible_child_name('pdf')
self.view.external_viewer_button.set_sensitive(True)
- self.view.external_viewer_button_revealer.set_reveal_child(True)
+ self.view.preview_button_revealer.set_reveal_child(True)
def start_fade_loop(self):
def draw():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/setzer/document/preview/preview_viewgtk.py
new/Setzer-61/setzer/document/preview/preview_viewgtk.py
--- old/Setzer-60/setzer/document/preview/preview_viewgtk.py 2023-09-21
10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/document/preview/preview_viewgtk.py 2023-10-23
10:54:56.000000000 +0200
@@ -46,19 +46,21 @@
self.recolor_pdf_toggle.get_style_context().add_class('flat')
self.recolor_pdf_toggle.set_can_focus(False)
self.recolor_pdf_toggle.get_style_context().add_class('scbar')
- self.action_bar_right.append(self.recolor_pdf_toggle)
self.external_viewer_button =
Gtk.Button.new_from_icon_name('external-viewer-symbolic')
self.external_viewer_button.set_tooltip_text(_('External Viewer'))
self.external_viewer_button.get_style_context().add_class('flat')
self.external_viewer_button.set_can_focus(False)
self.external_viewer_button.get_style_context().add_class('scbar')
- self.external_viewer_button_revealer = Gtk.Revealer()
-
self.external_viewer_button_revealer.set_transition_type(Gtk.RevealerTransitionType.NONE)
+
box = Gtk.Box.new(Gtk.Orientation.HORIZONTAL, 0)
+ box.append(self.recolor_pdf_toggle)
box.append(self.external_viewer_button)
- self.external_viewer_button_revealer.set_child(box)
- self.action_bar_right.append(self.external_viewer_button_revealer)
+
+ self.preview_button_revealer = Gtk.Revealer()
+
self.preview_button_revealer.set_transition_type(Gtk.RevealerTransitionType.NONE)
+ self.preview_button_revealer.set_child(box)
+ self.action_bar_right.append(self.preview_button_revealer)
self.append(self.action_bar)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/setzer/document/search/search.py
new/Setzer-61/setzer/document/search/search.py
--- old/Setzer-60/setzer/document/search/search.py 2023-09-21
10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/document/search/search.py 2023-10-23
10:54:56.000000000 +0200
@@ -82,8 +82,7 @@
if number_of_occurrences > 0:
dialog = DialogLocator.get_dialog('replace_confirmation')
- if dialog.run(original, replacement, number_of_occurrences):
- self.search_context.replace_all(replacement, -1)
+ dialog.run(original, replacement, number_of_occurrences,
self.search_context)
def on_search_entry_activate(self, entry=None):
self.on_search_next_match(entry, True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/widgets/scrolling_widget/scrolling_widget.py
new/Setzer-61/setzer/widgets/scrolling_widget/scrolling_widget.py
--- old/Setzer-60/setzer/widgets/scrolling_widget/scrolling_widget.py
2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/widgets/scrolling_widget/scrolling_widget.py
2023-10-23 10:54:56.000000000 +0200
@@ -32,7 +32,7 @@
self.scrolling_offset_x, self.scrolling_offset_y = 0, 0
self.width, self.height = 0, 0
self.cursor_x, self.cursor_y = None, None
- self.sigmoid = 1
+ self.scrolling_multiplier = 2.5
self.last_cursor_scrolling_change = time.time()
self.view = Gtk.Overlay()
@@ -96,6 +96,8 @@
self.adjustment_y.set_value(position[1])
def on_scroll(self, controller, dx, dy):
+ if abs(dx) > 0 and abs(dy / dx) >= 1: dx = 0
+
modifiers = Gtk.accelerator_get_default_mod_mask()
if controller.get_current_event_state() & modifiers == 0:
@@ -103,9 +105,8 @@
dx *= self.adjustment_x.get_page_size() ** (2/3)
dy *= self.adjustment_y.get_page_size() ** (2/3)
else:
- self.sigmoid = min(10, 15 / (1 + 2.71828**(-0.1 * abs(dy) +
2.3)))
- dy *= self.sigmoid
- dx *= self.sigmoid
+ dy *= self.scrolling_multiplier
+ dx *= self.scrolling_multiplier
self.adjustment_x.set_value(self.adjustment_x.get_value() + dx)
self.adjustment_y.set_value(self.adjustment_y.get_value() + dy)
@@ -118,7 +119,9 @@
self.add_change_code('zoom_request', zoom_amount)
def on_decelerate(self, controller, vel_x, vel_y):
- data = {'starting_time': time.time(), 'initial_position':
self.scrolling_offset_y, 'position': self.scrolling_offset_y, 'vel_y': vel_y *
self.sigmoid}
+ if abs(vel_x) > 0 and abs(vel_y / vel_x) > 1: vel_x = 0
+
+ data = {'starting_time': time.time(), 'initial_position':
self.scrolling_offset_y, 'position': self.scrolling_offset_y, 'vel_y': vel_y *
self.scrolling_multiplier}
self.deceleration(data)
def deceleration(self, data):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/workspace/document_chooser/document_chooser_viewgtk.py
new/Setzer-61/setzer/workspace/document_chooser/document_chooser_viewgtk.py
--- old/Setzer-60/setzer/workspace/document_chooser/document_chooser_viewgtk.py
2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/workspace/document_chooser/document_chooser_viewgtk.py
2023-10-23 10:54:56.000000000 +0200
@@ -27,7 +27,6 @@
class DocumentChooser(Gtk.Popover):
- ''' GEdit like document chooser widget '''
def __init__(self):
Gtk.Popover.__init__(self)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/workspace/document_switcher/document_switcher_viewgtk.py
new/Setzer-61/setzer/workspace/document_switcher/document_switcher_viewgtk.py
---
old/Setzer-60/setzer/workspace/document_switcher/document_switcher_viewgtk.py
2023-09-21 10:49:07.000000000 +0200
+++
new/Setzer-61/setzer/workspace/document_switcher/document_switcher_viewgtk.py
2023-10-23 10:54:56.000000000 +0200
@@ -66,8 +66,6 @@
self.center_button.set_valign(Gtk.Align.FILL)
self.center_label_welcome.set_valign(Gtk.Align.FILL)
- self.set_size_request(-1, 46)
-
class OpenDocsPopover(Gtk.Popover):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Setzer-60/setzer/workspace/headerbar/headerbar_viewgtk.py
new/Setzer-61/setzer/workspace/headerbar/headerbar_viewgtk.py
--- old/Setzer-60/setzer/workspace/headerbar/headerbar_viewgtk.py
2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/setzer/workspace/headerbar/headerbar_viewgtk.py
2023-10-23 10:54:56.000000000 +0200
@@ -27,7 +27,6 @@
class HeaderBar(Gtk.HeaderBar):
- ''' Title bar of the app, contains global controls '''
def __init__(self):
Gtk.HeaderBar.__init__(self)
@@ -69,7 +68,6 @@
self.button_bibtex = MenuBuilder.create_button(_('New BibTeX
Document'))
self.new_document_popover = MenuBuilder.create_menu()
-
MenuBuilder.add_widget(self.new_document_popover, self.button_latex)
MenuBuilder.add_widget(self.new_document_popover, self.button_bibtex)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Setzer-60/setzer.in new/Setzer-61/setzer.in
--- old/Setzer-60/setzer.in 2023-09-21 10:49:07.000000000 +0200
+++ new/Setzer-61/setzer.in 2023-10-23 10:54:56.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!@python_path@
# coding: utf-8
# Copyright (C) 2017-present Robert Griesel
