Hello community, here is the log from the commit of package bijiben for openSUSE:Factory checked in at 2020-08-20 22:24:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bijiben (Old) and /work/SRC/openSUSE:Factory/.bijiben.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bijiben" Thu Aug 20 22:24:27 2020 rev:51 rq:827289 version:3.36.3 Changes: -------- --- /work/SRC/openSUSE:Factory/bijiben/bijiben.changes 2020-07-13 09:06:11.112191909 +0200 +++ /work/SRC/openSUSE:Factory/.bijiben.new.3399/bijiben.changes 2020-08-20 22:25:14.539880676 +0200 @@ -1,0 +2,8 @@ +Sat Aug 15 19:50:29 UTC 2020 - Bjørn Lie <[email protected]> + +- Update to version 3.36.3: + + Fixed issue in main view paging that was preventing to show + more than 48 notes. + + Updated translations. + +------------------------------------------------------------------- Old: ---- bijiben-3.36.2.tar.xz New: ---- bijiben-3.36.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bijiben.spec ++++++ --- /var/tmp/diff_new_pack.1PlVsD/_old 2020-08-20 22:25:16.179881442 +0200 +++ /var/tmp/diff_new_pack.1PlVsD/_new 2020-08-20 22:25:16.183881444 +0200 @@ -19,7 +19,7 @@ %bcond_with zeitgeist Name: bijiben -Version: 3.36.2 +Version: 3.36.3 Release: 0 Summary: Note editor for GNOME License: GPL-3.0-or-later AND CC-BY-SA-3.0 ++++++ bijiben-3.36.2.tar.xz -> bijiben-3.36.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/NEWS new/bijiben-3.36.3/NEWS --- old/bijiben-3.36.2/NEWS 2020-07-08 06:00:25.276826600 +0200 +++ new/bijiben-3.36.3/NEWS 2020-08-14 02:59:15.626177800 +0200 @@ -1,3 +1,12 @@ +Overview of changes in 3.36.3 +============================= + +* Added Central Kurdish translation (Jwtiyar Nariman) +* Fixed issue in main view paging that was preventing to show more than 48 notes + +Translations +* ckb (Jwtiyar Nariman) + Overview of changes in 3.36.2 ============================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/data/appdata/org.gnome.Notes.appdata.xml.in new/bijiben-3.36.3/data/appdata/org.gnome.Notes.appdata.xml.in --- old/bijiben-3.36.2/data/appdata/org.gnome.Notes.appdata.xml.in 2020-07-08 06:00:25.278826700 +0200 +++ new/bijiben-3.36.3/data/appdata/org.gnome.Notes.appdata.xml.in 2020-08-14 02:59:15.628178000 +0200 @@ -39,6 +39,20 @@ </screenshots> <releases> + <release date="2020-08-13" version="3.36.3"> + <description> + <p>This release brings the following new features and improvements:</p> + <ul> + <li>Added Central Kurdish translation (Jwtiyar Nariman)</li> + <li>Fixed issue in main view paging that was preventing to show more than 48 notes</li> + </ul> + <p>This release updates the following translations:</p> + <ul> + <li>ckb (Jwtiyar Nariman)</li> + </ul> + <p>Thanks to all the contributors who worked on GNOME Notes!</p> + </description> + </release> <release date="2020-07-08" version="3.36.2"> <description> <p>This release brings the following new features and improvements:</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/meson.build new/bijiben-3.36.3/meson.build --- old/bijiben-3.36.2/meson.build 2020-07-08 06:00:25.285826700 +0200 +++ new/bijiben-3.36.3/meson.build 2020-08-14 02:59:15.642178000 +0200 @@ -1,6 +1,6 @@ project( 'bijiben', 'c', - version: '3.36.2', + version: '3.36.3', license: 'GPL3', default_options: 'buildtype=debugoptimized', meson_version: '>= 0.43.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/po/LINGUAS new/bijiben-3.36.3/po/LINGUAS --- old/bijiben-3.36.2/po/LINGUAS 2020-07-08 06:00:25.285826700 +0200 +++ new/bijiben-3.36.3/po/LINGUAS 2020-08-14 02:59:15.643178000 +0200 @@ -5,6 +5,7 @@ as be bs +ckb cs ca ca@valencia diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/po/POTFILES.in new/bijiben-3.36.3/po/POTFILES.in --- old/bijiben-3.36.2/po/POTFILES.in 2020-07-08 06:00:25.285826700 +0200 +++ new/bijiben-3.36.3/po/POTFILES.in 2020-08-14 02:59:15.643178000 +0200 @@ -16,7 +16,6 @@ src/bjb-color-button.c src/bjb-editor-toolbar.c src/bjb-empty-results-box.c -src/bjb-load-more-button.c src/bjb-main-toolbar.c src/bjb-main-view.c src/bjb-note-view.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/po/ckb.po new/bijiben-3.36.3/po/ckb.po --- old/bijiben-3.36.2/po/ckb.po 1970-01-01 01:00:00.000000000 +0100 +++ new/bijiben-3.36.3/po/ckb.po 2020-08-14 02:59:15.664178100 +0200 @@ -0,0 +1,573 @@ +# Central Kurdish translation for gnome-notes. +# Copyright (C) 2020 gnome-notes's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-notes package. +# Jwtiyar Nariman <[email protected]>, 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-notes gnome-3-36\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-notes/issues\n"; +"POT-Creation-Date: 2020-06-26 04:20+0000\n" +"PO-Revision-Date: 2020-08-04 23:37+0300\n" +"Language-Team: Central Kurdish <[email protected]>\n" +"Language: ckb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Last-Translator: Jwtiyar Nariman <[email protected]>\n" +"X-Generator: Poedit 2.4\n" + +#: data/appdata/org.gnome.Notes.appdata.xml.in:6 +#: data/org.gnome.Notes.desktop.in:3 data/org.gnome.Notes.xml.in:4 +#: src/bjb-application.c:634 src/bjb-window-base.c:18 +msgid "Notes" +msgstr "تێبینییەکان" + +#: data/appdata/org.gnome.Notes.appdata.xml.in:7 +msgid "Notes for GNOME" +msgstr "" + +#: data/appdata/org.gnome.Notes.appdata.xml.in:9 +msgid "" +"A quick and easy way to make freeform notes or jot down simple lists. Store " +"as many notes as you like and share them by email." +msgstr "" + +#: data/appdata/org.gnome.Notes.appdata.xml.in:12 +msgid "" +"You can store your notes locally on your computer or sync with online " +"services like ownCloud." +msgstr "" + +#: data/appdata/org.gnome.Notes.appdata.xml.in:28 +msgid "Edit view" +msgstr "" + +#: data/appdata/org.gnome.Notes.appdata.xml.in:32 +msgid "Select view" +msgstr "" + +#: data/appdata/org.gnome.Notes.appdata.xml.in:36 +msgid "List view" +msgstr "پیشاندانی لیستەیی" + +#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: data/org.gnome.Notes.desktop.in:5 +msgid "notes;reminder;notebook;sticky notes;" +msgstr "" + +#: data/org.gnome.Notes.desktop.in:6 +msgid "Post notes, tag files!" +msgstr "" + +#: data/org.gnome.Notes.desktop.in:7 +msgid "Note-taker" +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:10 +msgid "Custom Font" +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:11 +msgid "The font name set here will be used as the font when displaying notes." +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:15 +msgid "Whether to use the system monospace font" +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:19 +msgid "New notes color." +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:20 +msgid "" +"The color name set here will be used as the color when creating new notes." +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:24 +msgid "Primary notes provider to use for new notes." +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:25 +msgid "The primary notebook is the place where new notes are created." +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:29 +msgid "Window maximized" +msgstr "پەنجەرە گەورەکرایەوە" + +#: data/org.gnome.Notes.gschema.xml:30 +msgid "Window maximized state." +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:34 +msgid "Window size" +msgstr "قەبارەی پەنجەرە" + +#: data/org.gnome.Notes.gschema.xml:35 +msgid "Window size (width and height)." +msgstr "قەبارەی پەنجەرە(پانی و بەرزی)" + +#: data/org.gnome.Notes.gschema.xml:39 +msgid "Window position" +msgstr "شوێنی پەنجەرە" + +#: data/org.gnome.Notes.gschema.xml:40 +msgid "Window position (x and y)." +msgstr "شوێنی پەنجەرە( x و y)" + +#: data/org.gnome.Notes.gschema.xml:43 +msgid "How to show note items" +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:44 +msgid "Whether to show note items in icon view or list view." +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:48 +msgid "Text size used by note editor." +msgstr "" + +#: data/org.gnome.Notes.gschema.xml:49 +msgid "" +"There are three text sizes available: small, medium (default) and large." +msgstr "" + +#: data/resources/editor-toolbar.ui:51 +msgid "Bold" +msgstr "قەڵەو" + +#: data/resources/editor-toolbar.ui:67 +msgid "Italic" +msgstr "لار" + +#: data/resources/editor-toolbar.ui:83 +msgid "Strike" +msgstr "" + +#: data/resources/editor-toolbar.ui:111 +msgid "Bullets" +msgstr "خاڵەکان" + +#: data/resources/editor-toolbar.ui:127 +msgid "List" +msgstr "لیست" + +#: data/resources/editor-toolbar.ui:166 +msgid "Copy selection to a new note" +msgstr "" + +#: data/resources/empty-results-box.ui:33 +msgid "No notes" +msgstr "" + +#: data/resources/help-overlay.ui:9 +msgctxt "shortcut window" +msgid "General" +msgstr "گشتی" + +#: data/resources/help-overlay.ui:14 +msgctxt "shortcut window" +msgid "Search notes" +msgstr "" + +#: data/resources/help-overlay.ui:21 +msgctxt "shortcut window" +msgid "New note" +msgstr "" + +#: data/resources/help-overlay.ui:28 +msgctxt "shortcut window" +msgid "Close window" +msgstr "پەنجەرە دابخە" + +#: data/resources/help-overlay.ui:35 +msgctxt "shortcut window" +msgid "Go back" +msgstr "بڕۆدواوە" + +#: data/resources/help-overlay.ui:42 +msgctxt "shortcut window" +msgid "Show help" +msgstr "یارمەتی پێشان بدە" + +#: data/resources/help-overlay.ui:49 +msgctxt "shortcut window" +msgid "Keyboard shortcuts" +msgstr "قەدبڕەکانی تەختەکلیل" + +#: data/resources/help-overlay.ui:57 +msgctxt "shortcut window" +msgid "Selection mode" +msgstr "" + +#: data/resources/help-overlay.ui:62 +msgctxt "shortcut window" +msgid "Cancel selection mode" +msgstr "" + +#: data/resources/help-overlay.ui:69 +msgctxt "shortcut window" +msgid "Select all" +msgstr "هەڵبژاردنی هەموو" + +#: data/resources/help-overlay.ui:77 +msgctxt "shortcut window" +msgid "Note edit mode" +msgstr "" + +#: data/resources/help-overlay.ui:82 +msgctxt "shortcut window" +msgid "Open in a new window" +msgstr "" + +#: data/resources/help-overlay.ui:89 +msgctxt "shortcut window" +msgid "Bold" +msgstr "قەڵەو" + +#: data/resources/help-overlay.ui:96 +msgctxt "shortcut window" +msgid "Italic" +msgstr "لار" + +#: data/resources/help-overlay.ui:103 +msgctxt "shortcut window" +msgid "Strike through" +msgstr "" + +#: data/resources/help-overlay.ui:110 +msgctxt "shortcut window" +msgid "Undo" +msgstr "گەڕانەوە" + +#: data/resources/help-overlay.ui:117 +msgctxt "shortcut window" +msgid "Redo" +msgstr "چوونەپێش" + +#: data/resources/help-overlay.ui:124 +msgctxt "shortcut window" +msgid "Move note to trash" +msgstr "" + +#: data/resources/import-dialog.ui:5 data/resources/main-toolbar.ui:225 +msgid "Import Notes" +msgstr "" + +#: data/resources/import-dialog.ui:12 data/resources/main-toolbar.ui:72 +msgid "_Cancel" +msgstr "_پاشگەزبوونەوە" + +#: data/resources/import-dialog.ui:22 +msgid "_Import" +msgstr "_هێنان" + +#: data/resources/import-dialog.ui:41 +msgid "Select import location" +msgstr "" + +#: data/resources/import-dialog.ui:78 +msgid "Gnote application" +msgstr "" + +#: data/resources/import-dialog.ui:136 +msgid "Tomboy application" +msgstr "" + +#: data/resources/import-dialog.ui:192 +msgid "Custom Location" +msgstr "" + +#: data/resources/import-dialog.ui:224 +msgid "Select a Folder" +msgstr "" + +#: data/resources/main-toolbar.ui:14 +msgid "_New" +msgstr "_نوێ" + +#: data/resources/main-toolbar.ui:43 data/resources/selection-toolbar.ui:43 +msgid "Note color" +msgstr "" + +#. Translators: “Empty” is a verb. +#: data/resources/main-toolbar.ui:55 +msgid "_Empty" +msgstr "_بەتاڵ" + +#: data/resources/main-toolbar.ui:74 +msgid "Exit selection mode" +msgstr "" + +#: data/resources/main-toolbar.ui:94 +msgid "Search note titles, content and notebooks" +msgstr "" + +#: data/resources/main-toolbar.ui:119 +msgid "View notes and notebooks in a grid" +msgstr "" + +#: data/resources/main-toolbar.ui:137 +msgid "View notes and notebooks in a list" +msgstr "" + +#: data/resources/main-toolbar.ui:161 +msgid "Selection mode" +msgstr "" + +#: data/resources/main-toolbar.ui:175 +msgid "Open menu" +msgstr "" + +#: data/resources/main-toolbar.ui:195 +msgid "More options" +msgstr "" + +#: data/resources/main-toolbar.ui:234 +msgid "View Trash" +msgstr "" + +#: data/resources/main-toolbar.ui:251 +msgid "Text Sizes" +msgstr "" + +#: data/resources/main-toolbar.ui:261 +msgid "_Large" +msgstr "_گەورە" + +#: data/resources/main-toolbar.ui:271 +msgid "_Medium" +msgstr "_مامناوەندی" + +#: data/resources/main-toolbar.ui:281 +msgid "_Small" +msgstr "_بچووک" + +#: data/resources/main-toolbar.ui:299 data/resources/settings-dialog.ui:10 +msgid "Preferences" +msgstr "هەڵبژاردەکان" + +#: data/resources/main-toolbar.ui:308 +msgid "Keyboard Shortcuts" +msgstr "قەدبڕەکانی تەختەکلیل" + +#: data/resources/main-toolbar.ui:317 +msgid "Help" +msgstr "یارمەتی" + +#: data/resources/main-toolbar.ui:326 +msgid "About Notes" +msgstr "" + +#: data/resources/main-toolbar.ui:348 +msgid "Open in New Window" +msgstr "لە پەنجەریەکی نوێ بیکەرەوە" + +#: data/resources/main-toolbar.ui:365 +msgid "Undo" +msgstr "گەڕانەوە" + +#: data/resources/main-toolbar.ui:374 +msgid "Redo" +msgstr "چوونەپێش" + +#: data/resources/main-toolbar.ui:391 data/resources/organize-dialog.ui:4 +#: data/resources/selection-toolbar.ui:34 +msgid "Notebooks" +msgstr "" + +#: data/resources/main-toolbar.ui:400 +msgid "Email this Note" +msgstr "" + +#: data/resources/main-toolbar.ui:409 data/resources/selection-toolbar.ui:96 +msgid "Move to Trash" +msgstr "بیگوازەوە بۆ تەنەکەی خۆڵ" + +#: data/resources/organize-dialog.ui:16 +msgid "Enter a name to create a notebook" +msgstr "" + +#: data/resources/organize-dialog.ui:37 +msgid "New notebook" +msgstr "" + +#: data/resources/selection-toolbar.ui:60 +msgid "Share note" +msgstr "" + +#: data/resources/selection-toolbar.ui:78 +msgid "Open in another window" +msgstr "" + +#: data/resources/selection-toolbar.ui:119 +msgid "Restore" +msgstr "هێنانەوە" + +#: data/resources/selection-toolbar.ui:127 +msgid "Permanently Delete" +msgstr "" + +#: data/resources/settings-dialog.ui:37 +msgid "Use System Font" +msgstr "" + +#: data/resources/settings-dialog.ui:50 +msgid "Note Font" +msgstr "" + +#: data/resources/settings-dialog.ui:62 +msgid "Default Color" +msgstr "" + +#: data/resources/settings-dialog.ui:113 +msgid "Note Appearance" +msgstr "" + +#: data/resources/settings-dialog.ui:126 +msgid "Select the default storage location:" +msgstr "" + +#: data/resources/settings-dialog.ui:157 +msgid "Primary Book" +msgstr "" + +#: src/bijiben-shell-search-provider.c:270 src/bjb-main-toolbar.c:394 +msgid "Untitled" +msgstr "بێناو" + +#: src/bjb-application.c:459 +msgid "Show the application’s version" +msgstr "وەشانی داوانامە پیشان بدە" + +#: src/bjb-application.c:461 +msgid "Create a new note" +msgstr "" + +#: src/bjb-application.c:463 +msgid "[FILE…]" +msgstr "[FILE…]" + +#: src/bjb-application.c:471 +msgid "Take notes and export them everywhere." +msgstr "" + +#. Translators: this is a fatal error quit message +#. * printed on the command line +#: src/bjb-application.c:482 +msgid "Could not parse arguments" +msgstr "" + +#: src/bjb-application.c:490 +msgid "GNOME Notes" +msgstr "" + +#. Translators: this is a fatal error quit message +#. * printed on the command line +#: src/bjb-application.c:502 +msgid "Could not register the application" +msgstr "" + +#: src/bjb-application.c:635 +msgid "Simple notebook for GNOME" +msgstr "" + +#: src/bjb-application.c:641 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jwtiyar Nariman https://launchpad.net/~jwtiyar"; + +#: src/bjb-color-button.c:140 +msgid "Note Color" +msgstr "" + +#: src/bjb-empty-results-box.c:63 +msgid "Press the New button to create a note." +msgstr "" + +#: src/bjb-empty-results-box.c:85 +msgid "Oops" +msgstr "" + +#: src/bjb-empty-results-box.c:91 +msgid "Please install “Tracker” then restart the application." +msgstr "" + +#: src/bjb-load-more-button.c:69 src/bjb-load-more-button.c:147 +msgid "Load More" +msgstr "" + +#: src/bjb-load-more-button.c:90 +msgid "Loading…" +msgstr "ئامادەکردن…" + +#: src/bjb-main-toolbar.c:140 +msgid "Click on items to select them" +msgstr "" + +#: src/bjb-main-toolbar.c:142 +#, c-format +msgid "%d selected" +msgid_plural "%d selected" +msgstr[0] "%d دیاریکراو" +msgstr[1] "%d دیاریکراو" + +#: src/bjb-main-toolbar.c:275 +#, c-format +msgid "Results for %s" +msgstr "" + +#: src/bjb-main-toolbar.c:278 +msgid "New and Recent" +msgstr "" + +#: src/bjb-main-toolbar.c:370 +msgid "Trash" +msgstr "تەنەکەخۆڵ" + +#. Translators: %s is the note last recency description. +#. * Last updated is placed as in left to right language +#. * right to left languages might move %s +#. * '%s Last Updated' +#. +#: src/bjb-main-toolbar.c:438 +#, c-format +msgid "Last updated: %s" +msgstr "" + +#: src/bjb-utils.c:51 src/libbiji/biji-date-time.c:30 +#: src/libbiji/biji-date-time.c:51 +msgid "Unknown" +msgstr "نەناسراو" + +#: src/bjb-utils.c:68 src/libbiji/biji-date-time.c:42 +msgid "Yesterday" +msgstr "دوێنێ" + +#: src/bjb-utils.c:74 src/libbiji/biji-date-time.c:56 +msgid "This month" +msgstr "ئەم مانگە" + +#: src/libbiji/biji-date-time.c:38 +msgid "Today" +msgstr "ئەمڕۆ" + +#: src/libbiji/biji-date-time.c:47 +msgid "This week" +msgstr "ئەم هەفتەیە" + +#: src/libbiji/biji-date-time.c:60 +msgid "This year" +msgstr "ئەمساڵ" + +#: src/libbiji/biji-notebook.c:265 +msgid "Local" +msgstr "ناوخۆیی" + +#: src/libbiji/provider/biji-local-provider.c:366 +msgid "Local storage" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/src/bjb-load-more-button.c new/bijiben-3.36.3/src/bjb-load-more-button.c --- old/bijiben-3.36.2/src/bjb-load-more-button.c 2020-07-08 06:00:25.296826600 +0200 +++ new/bijiben-3.36.3/src/bjb-load-more-button.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,250 +0,0 @@ -/* - * Bjb - access, organize and share your bjb on GNOME - * Copyright © 2013 Red Hat, Inc. - * - * 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; either version 2 - * of the License, or (at your option) any later version. - * - * 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 Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/* Chained based on Photos, Documents */ - -#include "config.h" - -#include <glib.h> -#include <glib/gi18n.h> -#include <glib/gprintf.h> - - -#include "bjb-load-more-button.h" - -struct _BjbLoadMoreButton -{ - GtkButton parent_instance; - - GtkWidget *revealer; - GtkWidget *label; - GtkWidget *spinner; - gboolean block; - - BjbController *controller; -}; - - -enum -{ - PROP_0, - PROP_BJB_CONTROLLER, - NUM_PROPERTIES -}; - -static GParamSpec *properties[NUM_PROPERTIES] = { NULL, }; - - -G_DEFINE_TYPE (BjbLoadMoreButton, bjb_load_more_button, GTK_TYPE_BUTTON) - - -static void -on_displayed_items_changed (BjbController *controller, - gboolean some_is_shown, - gboolean remaining, - BjbLoadMoreButton *self) -{ - gtk_spinner_stop (GTK_SPINNER (self->spinner)); - - if (some_is_shown) - { - gtk_widget_hide (self->spinner); - gtk_label_set_label (GTK_LABEL (self->label), _("Load More")); - - if (remaining && (self->block == FALSE)) - gtk_revealer_set_reveal_child (GTK_REVEALER (self->revealer), TRUE); - else - gtk_revealer_set_reveal_child (GTK_REVEALER (self->revealer), FALSE); - } - else - { - gtk_revealer_set_reveal_child (GTK_REVEALER (self->revealer), FALSE); - } -} - - -static void -bjb_load_more_button_clicked (GtkButton *button) -{ - BjbLoadMoreButton *self; - - self = BJB_LOAD_MORE_BUTTON (button); - - gtk_label_set_label (GTK_LABEL (self->label), _("Loading…")); - gtk_widget_show (self->spinner); - gtk_spinner_start (GTK_SPINNER (self->spinner)); - - bjb_controller_show_more (self->controller); -} - - -static void -bjb_load_more_button_constructed (GObject *object) -{ - BjbLoadMoreButton *self; - - self = BJB_LOAD_MORE_BUTTON (object); - - g_signal_connect (self->controller, "display-items-changed", - G_CALLBACK (on_displayed_items_changed), self); - - G_OBJECT_CLASS (bjb_load_more_button_parent_class)->constructed (object); - gtk_widget_show_all (GTK_WIDGET (self)); -} - - -static void -bjb_load_more_button_finalize (GObject *object) -{ - BjbLoadMoreButton *self; - - self = BJB_LOAD_MORE_BUTTON (object); - - if (self->controller && BJB_IS_CONTROLLER (self->controller)) - g_signal_handlers_disconnect_by_func - (self->controller, on_displayed_items_changed, self); -} - -static void -bjb_load_more_button_init (BjbLoadMoreButton *self) -{ - GtkStyleContext *context; - GtkWidget *child; - - context = gtk_widget_get_style_context (GTK_WIDGET (self)); - gtk_style_context_add_class (context, "documents-load-more"); - - child = gtk_grid_new (); - gtk_widget_set_halign (child, GTK_ALIGN_CENTER); - gtk_widget_set_hexpand (child, TRUE); - gtk_widget_set_visible (child, TRUE); - gtk_grid_set_column_spacing (GTK_GRID (child), 10); - gtk_container_add (GTK_CONTAINER (self), child); - - self->spinner = gtk_spinner_new (); - gtk_widget_set_halign (self->spinner, GTK_ALIGN_CENTER); - gtk_widget_set_no_show_all (self->spinner, TRUE); - gtk_widget_set_size_request (self->spinner, 16, 16); - gtk_container_add (GTK_CONTAINER (child), self->spinner); - - self->label = gtk_label_new (_("Load More")); - gtk_widget_set_visible (self->label, TRUE); - gtk_container_add (GTK_CONTAINER (child), self->label); - - self->revealer = gtk_revealer_new (); - gtk_container_add (GTK_CONTAINER (self->revealer), GTK_WIDGET (self)); -} - - -static void -bjb_load_more_button_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - BjbLoadMoreButton *self = BJB_LOAD_MORE_BUTTON (object); - - switch (prop_id) - { - case PROP_BJB_CONTROLLER: - g_value_set_object (value, self->controller); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -bjb_load_more_button_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - BjbLoadMoreButton *self = BJB_LOAD_MORE_BUTTON (object); - - switch (prop_id) - { - case PROP_BJB_CONTROLLER: - self->controller = g_value_get_object (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - - -static void -bjb_load_more_button_class_init (BjbLoadMoreButtonClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - GtkButtonClass *button_class = GTK_BUTTON_CLASS (class); - - object_class->constructed = bjb_load_more_button_constructed; - object_class->finalize = bjb_load_more_button_finalize; - object_class->get_property = bjb_load_more_button_get_property; - object_class->set_property = bjb_load_more_button_set_property; - button_class->clicked = bjb_load_more_button_clicked; - - properties[PROP_BJB_CONTROLLER] = g_param_spec_object ("controller", - "Controller", - "BjbController", - BJB_TYPE_CONTROLLER, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_STRINGS); - - g_object_class_install_properties (object_class, NUM_PROPERTIES, properties); -} - - -GtkWidget * -bjb_load_more_button_new (BjbController *controller) -{ - BjbLoadMoreButton *button; - - button = g_object_new (BJB_TYPE_LOAD_MORE_BUTTON, "controller", controller, NULL); - return GTK_WIDGET (button); -} - - -void -bjb_load_more_button_set_block (BjbLoadMoreButton *self, gboolean block) -{ - BjbController *controller; - - if (self->block == block) - return; - - self->block = block; - controller = self->controller; - on_displayed_items_changed (controller, - bjb_controller_shows_item (controller), - bjb_controller_get_remaining_items (controller), - self); -} - - -GtkWidget * -bjb_load_more_button_get_revealer (BjbLoadMoreButton *self) -{ - return self->revealer; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/src/bjb-load-more-button.h new/bijiben-3.36.3/src/bjb-load-more-button.h --- old/bijiben-3.36.2/src/bjb-load-more-button.h 2020-07-08 06:00:25.296826600 +0200 +++ new/bijiben-3.36.3/src/bjb-load-more-button.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -/* - * Bjb - access, organize and share your bjb on GNOME - * Copyright © 2013 Red Hat, Inc. - * - * 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; either version 2 - * of the License, or (at your option) any later version. - * - * 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 Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/* Chained based on Photos, Documents */ - -#pragma once - -#include <gtk/gtk.h> - -#include "bjb-controller.h" - -G_BEGIN_DECLS - -#define BJB_TYPE_LOAD_MORE_BUTTON (bjb_load_more_button_get_type ()) - -G_DECLARE_FINAL_TYPE (BjbLoadMoreButton, bjb_load_more_button, BJB, LOAD_MORE_BUTTON, GtkButton) - - - /* Does not return self, but its revealer */ - -GtkWidget *bjb_load_more_button_new (BjbController *controller); - - -GtkWidget *bjb_load_more_button_get_revealer (BjbLoadMoreButton* button); - - -void bjb_load_more_button_set_block (BjbLoadMoreButton *button, gboolean block); - -G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/src/bjb-main-view.c new/bijiben-3.36.3/src/bjb-main-view.c --- old/bijiben-3.36.2/src/bjb-main-view.c 2020-07-08 06:00:25.297826500 +0200 +++ new/bijiben-3.36.3/src/bjb-main-view.c 2020-08-14 02:59:15.767179300 +0200 @@ -22,7 +22,6 @@ #include "bjb-application.h" #include "bjb-controller.h" -#include "bjb-load-more-button.h" #include "bjb-main-toolbar.h" #include "bjb-utils.h" #include "bjb-main-view.h" @@ -67,7 +66,6 @@ /* View Notes , model */ GdMainView *view; BjbController *controller; - GtkWidget *load_more; /* Signals */ gulong key; @@ -76,39 +74,13 @@ gulong view_selection_changed; }; - G_DEFINE_TYPE (BjbMainView, bjb_main_view, GTK_TYPE_GRID) - -static void bjb_main_view_view_changed (BjbMainView *self); - - static void bjb_main_view_init (BjbMainView *self) { } - - -void -bjb_main_view_disconnect_scrolled_window (BjbMainView *self) -{ - GtkAdjustment *vadjustment; - GtkWidget *vscrollbar; - - if (self->view == NULL || - !GTK_IS_SCROLLED_WINDOW (self->view)) - return; - - vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (self->view)); - vscrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (self->view)); - - g_signal_handlers_disconnect_by_func (vadjustment, bjb_main_view_view_changed, self); - g_signal_handlers_disconnect_by_func (vscrollbar, bjb_main_view_view_changed, self); -} - - - static void bjb_main_view_disconnect_handlers (BjbMainView *self) { @@ -127,13 +99,10 @@ self->view_selection_changed =0; } - - static void bjb_main_view_dispose (GObject *object) { bjb_main_view_disconnect_handlers (BJB_MAIN_VIEW (object)); - bjb_main_view_disconnect_scrolled_window (BJB_MAIN_VIEW (object)); G_OBJECT_CLASS (bjb_main_view_parent_class)->dispose (object); } @@ -549,56 +518,21 @@ } - - static void -bjb_main_view_view_changed (BjbMainView *self) +on_show_more_cb (BjbMainView *self, + GtkPositionType pos) { - GtkAdjustment *vadjustment; - GtkWidget *vscrollbar; - gboolean end; - gdouble page_size; - gdouble upper; - gdouble value; - gint reveal_area_height; - - reveal_area_height = 32; - end = FALSE; - if (self->view == NULL) - return; - - vscrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (self->view)); + if (pos == GTK_POS_BOTTOM) + bjb_controller_show_more (self->controller); - if (vscrollbar == NULL || !gtk_widget_get_visible (GTK_WIDGET (vscrollbar))) - { - bjb_load_more_button_set_block (BJB_LOAD_MORE_BUTTON (self->load_more), TRUE); - return; - } - - vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (self->view)); - page_size = gtk_adjustment_get_page_size (vadjustment); - upper = gtk_adjustment_get_upper (vadjustment); - value = gtk_adjustment_get_value (vadjustment); - - /* Special case these values which happen at construction */ - if ((gint) value == 0 && (gint) upper == 1 && (gint) page_size == 1) - end = FALSE; - else - end = !(value < (upper - page_size - reveal_area_height)); - - bjb_load_more_button_set_block (BJB_LOAD_MORE_BUTTON (self->load_more), !end); } - static void bjb_main_view_constructed(GObject *o) { - BjbMainView *self; - GtkAdjustment *vadjustment; - GtkWidget *vscrollbar; - GtkWidget *button; - BjbSettings *settings; - GdMainViewType type; + BjbMainView *self; + BjbSettings *settings; + GdMainViewType type; G_OBJECT_CLASS (bjb_main_view_parent_class)->constructed(G_OBJECT(o)); @@ -621,33 +555,12 @@ gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->view)); gtk_widget_show (GTK_WIDGET (self->view)); - vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (self->view)); - - g_signal_connect_object (vadjustment, - "changed", - G_CALLBACK (bjb_main_view_view_changed), - self, - G_CONNECT_SWAPPED); - g_signal_connect_object (vadjustment, - "value-changed", - G_CALLBACK (bjb_main_view_view_changed), - self, - G_CONNECT_SWAPPED); - - vscrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (self->view)); - g_signal_connect_object (vscrollbar, - "notify::visible", - G_CALLBACK (bjb_main_view_view_changed), + g_signal_connect_object (GTK_SCROLLED_WINDOW (self->view), + "edge-overshot", + G_CALLBACK (on_show_more_cb), self, G_CONNECT_SWAPPED); - /* Load more */ - self->load_more = bjb_load_more_button_new (self->controller); - button = bjb_load_more_button_get_revealer (BJB_LOAD_MORE_BUTTON (self->load_more)); - gtk_container_add (GTK_CONTAINER (self), button); - bjb_main_view_view_changed (self); - - /* Selection Panel */ self->select_bar = bjb_selection_toolbar_new (self->view, self); gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->select_bar)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/src/bjb-main-view.h new/bijiben-3.36.3/src/bjb-main-view.h --- old/bijiben-3.36.2/src/bjb-main-view.h 2020-07-08 06:00:25.297826500 +0200 +++ new/bijiben-3.36.3/src/bjb-main-view.h 2020-08-14 02:59:15.767179300 +0200 @@ -63,8 +63,4 @@ void bjb_main_view_set_view_type (BjbMainView *view, GdMainViewType type); - -void bjb_main_view_disconnect_scrolled_window (BjbMainView *self); - - G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/src/bjb-window-base.c new/bijiben-3.36.3/src/bjb-window-base.c --- old/bijiben-3.36.2/src/bjb-window-base.c 2020-07-08 06:00:25.299826600 +0200 +++ new/bijiben-3.36.3/src/bjb-window-base.c 2020-08-14 02:59:15.772179400 +0200 @@ -308,7 +308,6 @@ static void bjb_window_base_destroy (gpointer a, BjbWindowBase * self) { - bjb_main_view_disconnect_scrolled_window (self->view); bjb_controller_disconnect (self->controller); bjb_window_base_save_geometry (self); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bijiben-3.36.2/src/meson.build new/bijiben-3.36.3/src/meson.build --- old/bijiben-3.36.2/src/meson.build 2020-07-08 06:00:25.304826500 +0200 +++ new/bijiben-3.36.3/src/meson.build 2020-08-14 02:59:15.784179400 +0200 @@ -7,7 +7,6 @@ 'bjb-editor-toolbar.c', 'bjb-empty-results-box.c', 'bjb-import-dialog.c', - 'bjb-load-more-button.c', 'bjb-main.c', 'bjb-main-toolbar.c', 'bjb-main-view.c',
