[gnome-characters] Clarify license
- From: Daiki Ueno <dueno src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-characters] Clarify license
- Date: Mon, 24 Nov 2014 18:15:15 +0000 (UTC)
commit de2ae1946827ddc71f174dff13e902f03f9eeef6
Author: Daiki Ueno <dueno src gnome org>
Date: Tue Nov 25 03:06:48 2014 +0900
Clarify license
COPYINGv2 | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 2 +-
src/categoryList.js | 18 +++
src/character.js | 178 +++++++++++++++------------
src/characterList.js | 90 ++++++++------
5 files changed, 510 insertions(+), 117 deletions(-)
---
diff --git a/COPYINGv2 b/COPYINGv2
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/COPYINGv2
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/Makefile.am b/Makefile.am
index 4d1467c..fc7bdfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,6 @@ rpm: dist
clean-local:
rm -fR $(builddir)/rpms
-EXTRA_DIST = $(PACKAGE_NAME).spec
+EXTRA_DIST = COPYINGv2 $(PACKAGE_NAME).spec
-include $(top_srcdir)/git.mk
diff --git a/src/categoryList.js b/src/categoryList.js
index 0f6e9d8..ab8f647 100644
--- a/src/categoryList.js
+++ b/src/categoryList.js
@@ -1,3 +1,21 @@
+// -*- Mode: js; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*-
+//
+// Copyright (C) 2014 Daiki Ueno <dueno src gnome org>
+//
+// 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.
+
const Lang = imports.lang;
const Params = imports.params;
const Gio = imports.gi.Gio;
diff --git a/src/character.js b/src/character.js
index 66286bd..d593ec8 100644
--- a/src/character.js
+++ b/src/character.js
@@ -1,3 +1,21 @@
+// -*- Mode: js; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*-
+//
+// Copyright (C) 2014 Daiki Ueno <dueno src gnome org>
+//
+// 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.
+
const Lang = imports.lang;
const Params = imports.params;
const Gio = imports.gi.Gio;
@@ -13,43 +31,43 @@ const CharacterDialog = new Lang.Class({
Name: 'CharacterDialog',
Extends: Gtk.Dialog,
Properties: {
- 'font': GObject.ParamSpec.string(
- 'font', '', '',
- GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
- 'Cantarell')
+ 'font': GObject.ParamSpec.string(
+ 'font', '', '',
+ GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
+ 'Cantarell')
},
get font() {
- return this._font;
+ return this._font;
},
set font(v) {
- if (v == this._font)
- return;
+ if (v == this._font)
+ return;
- this._font = v;
+ this._font = v;
let description = Pango.FontDescription.from_string(this._font);
this._characterLabel.override_font(description);
- let children = this._relatedList.get_children();
- for (let index in children) {
- let label = children[index].get_children()[0];
- label.override_font(description);
- }
+ let children = this._relatedList.get_children();
+ for (let index in children) {
+ let label = children[index].get_children()[0];
+ label.override_font(description);
+ }
},
_init: function(params) {
let filtered = Params.filter(params, { character: null });
params = Params.fill(params, { use_header_bar: true,
- width_request: 400,
- height_request: 400 });
+ width_request: 400,
+ height_request: 400 });
this.parent(params);
- this._cancellable = new Gio.Cancellable();
+ this._cancellable = new Gio.Cancellable();
let builder = new Gtk.Builder();
builder.add_from_resource('/org/gnome/Characters/character.ui');
- this._stack = builder.get_object('main-stack')
+ this._stack = builder.get_object('main-stack')
this.get_content_area().add(this._stack);
this._characterLabel = builder.get_object('character-label');
@@ -58,63 +76,63 @@ const CharacterDialog = new Lang.Class({
let copyButton = builder.get_object('copy-button');
copyButton.connect('clicked', Lang.bind(this, this._copyCharacter));
- this._relatedList = builder.get_object('related-listbox');
- this._relatedList.connect('row-selected',
- Lang.bind(this, this._handleRowSelected));
+ this._relatedList = builder.get_object('related-listbox');
+ this._relatedList.connect('row-selected',
+ Lang.bind(this, this._handleRowSelected));
- this._relatedButton = new Gtk.ToggleButton({ label: _("See Also") });
- this.add_action_widget(this._relatedButton, Gtk.ResponseType.HELP);
- this._relatedButton.show();
+ this._relatedButton = new Gtk.ToggleButton({ label: _("See Also") });
+ this.add_action_widget(this._relatedButton, Gtk.ResponseType.HELP);
+ this._relatedButton.show();
- this._relatedButton.connect(
- 'toggled',
- Lang.bind(this, function() {
- if (this._stack.visible_child_name == 'character')
- this._stack.visible_child_name = 'related';
- else
- this._stack.visible_child_name = 'character';
- }));
+ this._relatedButton.connect(
+ 'toggled',
+ Lang.bind(this, function() {
+ if (this._stack.visible_child_name == 'character')
+ this._stack.visible_child_name = 'related';
+ else
+ this._stack.visible_child_name = 'character';
+ }));
- Main.settings.bind('font', this, 'font',
- Gio.SettingsBindFlags.DEFAULT);
+ Main.settings.bind('font', this, 'font',
+ Gio.SettingsBindFlags.DEFAULT);
- this._setCharacter(filtered.character);
+ this._setCharacter(filtered.character);
},
_finishSearch: function(result) {
for (let index = 0; index < result.len; index++) {
- let uc = Gc.search_result_get(result, index);
- let name = Gc.character_name(uc);
- if (name == null)
- continue;
-
- let hbox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL });
-
- let characterLabel = new Gtk.Label({ label: uc,
- valign: Gtk.Align.CENTER,
- halign: Gtk.Align.CENTER,
- width_request: 45 });
- characterLabel.get_style_context().add_class('character');
- hbox.pack_start(characterLabel, false, false, 2);
-
- let nameLabel = new Gtk.Label({ label: Util.capitalize(name),
- halign: Gtk.Align.START });
- hbox.pack_start(nameLabel, true, true, 0);
-
- let row = new Gtk.ListBoxRow();
- row._character = uc;
- row.add(hbox);
- row.show_all();
-
- this._relatedList.add(row);
- }
-
- this._relatedButton.visible =
- this._relatedList.get_children().length > 0;
+ let uc = Gc.search_result_get(result, index);
+ let name = Gc.character_name(uc);
+ if (name == null)
+ continue;
+
+ let hbox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL });
+
+ let characterLabel = new Gtk.Label({ label: uc,
+ valign: Gtk.Align.CENTER,
+ halign: Gtk.Align.CENTER,
+ width_request: 45 });
+ characterLabel.get_style_context().add_class('character');
+ hbox.pack_start(characterLabel, false, false, 2);
+
+ let nameLabel = new Gtk.Label({ label: Util.capitalize(name),
+ halign: Gtk.Align.START });
+ hbox.pack_start(nameLabel, true, true, 0);
+
+ let row = new Gtk.ListBoxRow();
+ row._character = uc;
+ row.add(hbox);
+ row.show_all();
+
+ this._relatedList.add(row);
+ }
+
+ this._relatedButton.visible =
+ this._relatedList.get_children().length > 0;
},
_setCharacter: function(uc) {
- this._character = uc;
+ this._character = uc;
this._character = this._character;
this._characterLabel.label = this._character;
@@ -127,24 +145,24 @@ const CharacterDialog = new Lang.Class({
for (let index in children)
this._relatedList.remove(children[index]);
- this._cancellable.cancel();
- this._cancellable.reset();
- Gc.search_related(
- this._character,
+ this._cancellable.cancel();
+ this._cancellable.reset();
+ Gc.search_related(
+ this._character,
-1,
- this._cancellable,
- Lang.bind(this, function(source_object, res, user_data) {
- try {
- let result = Gc.search_finish(res);
- this._finishSearch(result);
- } catch (e) {
+ this._cancellable,
+ Lang.bind(this, function(source_object, res, user_data) {
+ try {
+ let result = Gc.search_finish(res);
+ this._finishSearch(result);
+ } catch (e) {
log("Failed to search related: " + e);
- }
- }));
+ }
+ }));
- this._relatedButton.active = false;
- this._stack.visible_child_name = 'character';
- this._stack.show_all();
+ this._relatedButton.active = false;
+ this._stack.visible_child_name = 'character';
+ this._stack.show_all();
let headerBar = this.get_header_bar();
let name = Gc.character_name(this._character);
@@ -163,10 +181,10 @@ const CharacterDialog = new Lang.Class({
_handleRowSelected: function(listBox, row) {
if (row != null) {
- this._setCharacter(row._character);
+ this._setCharacter(row._character);
let toplevel = this.get_transient_for();
let action = toplevel.lookup_action('character');
action.activate(new GLib.Variant('s', row._character));
- }
+ }
},
});
diff --git a/src/characterList.js b/src/characterList.js
index 21ad805..eb0a9d2 100644
--- a/src/characterList.js
+++ b/src/characterList.js
@@ -1,3 +1,21 @@
+// -*- Mode: js; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*-
+//
+// Copyright (C) 2014 Daiki Ueno <dueno src gnome org>
+//
+// 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.
+
const Lang = imports.lang;
const Params = imports.params;
const Gio = imports.gi.Gio;
@@ -24,14 +42,14 @@ const CharacterListRowWidget = new Lang.Class({
},
_init: function(params) {
- let filtered = Params.filter(params, { characters: null,
- font: null,
- cellWidth: null });
+ let filtered = Params.filter(params, { characters: null,
+ font: null,
+ cellWidth: null });
params = Params.fill(params, {});
this.parent(params);
this._characters = filtered.characters;
this._font = filtered.font;
- this._cellWidth = filtered.cellWidth;
+ this._cellWidth = filtered.cellWidth;
this.add_events(Gdk.EventMask.BUTTON_PRESS_MASK);
this.get_style_context().add_class('character-list-row');
},
@@ -58,8 +76,8 @@ const CharacterListRowWidget = new Lang.Class({
vfunc_size_allocate: function(allocation) {
this.parent(allocation);
- if (this._cellWidth < 0)
- this._cellWidth = allocation.width * CELL_SIZE;
+ if (this._cellWidth < 0)
+ this._cellWidth = allocation.width * CELL_SIZE;
},
vfunc_button_press_event: function(event) {
@@ -70,9 +88,9 @@ const CharacterListRowWidget = new Lang.Class({
},
vfunc_draw: function(cr) {
- // Use device coordinates directly, since PangoCairo doesn't
- // work well with scaled matrix:
- // https://bugzilla.gnome.org/show_bug.cgi?id=700592
+ // Use device coordinates directly, since PangoCairo doesn't
+ // work well with scaled matrix:
+ // https://bugzilla.gnome.org/show_bug.cgi?id=700592
let allocation = this.get_allocation();
// Clear the canvas.
@@ -116,24 +134,24 @@ const CharacterListWidget = new Lang.Class({
},
Properties: {
'font': GObject.ParamSpec.string(
- 'font', '', '',
+ 'font', '', '',
GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
'Cantarell')
},
get font() {
- return this._font;
+ return this._font;
},
set font(v) {
- if (v == this._font)
- return;
+ if (v == this._font)
+ return;
- this._font = v;
- if (this._characters) {
- this.setCharacters(this._characters);
- this.show_all();
- }
+ this._font = v;
+ if (this._characters) {
+ this.setCharacters(this._characters);
+ this.show_all();
+ }
},
_init: function(params) {
@@ -142,8 +160,8 @@ const CharacterListWidget = new Lang.Class({
this.parent(params);
this.get_style_context().add_class('character-list');
Main.settings.bind('font', this, 'font', Gio.SettingsBindFlags.DEFAULT);
- this._cellWidth = -1;
- this._cellsPerRow = CELLS_PER_ROW;
+ this._cellWidth = -1;
+ this._cellsPerRow = CELLS_PER_ROW;
},
vfunc_get_preferred_height: function() {
@@ -184,16 +202,16 @@ const CharacterListWidget = new Lang.Class({
vfunc_size_allocate: function(allocation) {
this.parent(allocation);
- if (this._cellWidth < 0)
- this._cellWidth = allocation.width * CELL_SIZE;
+ if (this._cellWidth < 0)
+ this._cellWidth = allocation.width * CELL_SIZE;
- // Reflow if the number of cells per row has changed.
- let cellsPerRow = Math.floor(allocation.width / this._cellWidth);
- if (cellsPerRow != this._cellsPerRow) {
- this._cellsPerRow = cellsPerRow;
- this.setCharacters(this._characters);
- this.show_all();
- }
+ // Reflow if the number of cells per row has changed.
+ let cellsPerRow = Math.floor(allocation.width / this._cellWidth);
+ if (cellsPerRow != this._cellsPerRow) {
+ this._cellsPerRow = cellsPerRow;
+ this.setCharacters(this._characters);
+ this.show_all();
+ }
// Make each row have the same height.
let rowHeight = this._cellWidth;
@@ -211,15 +229,15 @@ const CharacterListWidget = new Lang.Class({
_createCharacterListRow: function(characters) {
let rowWidget = new CharacterListRowWidget({
- characters: characters,
- font: this._font,
- cellWidth: this._cellWidth
- });
+ characters: characters,
+ font: this._font,
+ cellWidth: this._cellWidth
+ });
rowWidget.connect('character-selected',
Lang.bind(this, function(row, uc) {
this.emit('character-selected', uc);
}));
- return rowWidget;
+ return rowWidget;
},
setCharacters: function(characters) {
@@ -227,7 +245,7 @@ const CharacterListWidget = new Lang.Class({
for (let index in children)
this.remove(children[index]);
- this._characters = characters;
+ this._characters = characters;
if (characters.length == 0)
return;
@@ -237,7 +255,7 @@ const CharacterListWidget = new Lang.Class({
if (stop % this._cellsPerRow == 0) {
let rowCharacters = characters.slice(start, stop);
let rowWidget = this._createCharacterListRow(rowCharacters);
- this.pack_start(rowWidget, true, true, 0);
+ this.pack_start(rowWidget, true, true, 0);
start = stop;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
