Imported Upstream version 0.2.85+hg40 upstream/0.2.85+hg40
authorJulien Valroff <julien@kirya.net>
Sun, 17 Jul 2011 11:29:29 +0000 (13:29 +0200)
committerJulien Valroff <julien@kirya.net>
Sun, 17 Jul 2011 11:29:29 +0000 (13:29 +0200)
36 files changed:
CMakeLists.txt
COPYING
README
img/delete_status.png
img/direct_reply.png
img/updating.png
src/account_abstract.vala
src/accounts.vala
src/accounts_widget.vala [new file with mode: 0644]
src/avatar.vala
src/bg_box.vala
src/create_dialog_generic.vala
src/excluded/tree_widget.vala [new file with mode: 0644]
src/feed_view.vala
src/icon_with_status_cell_renderer.vala
src/identica_account.vala
src/identica_create_dialog.vala
src/identica_stream_group.vala
src/main.vala
src/main_window.vala
src/redrawable.vala [new file with mode: 0644]
src/settings.vala
src/status_choose_bar.vala
src/status_delegate.vala
src/stream_abstract.vala
src/streams_types.vala
src/tree_widget.vala [deleted file]
src/twitter_account.vala
src/twitter_create_dialog.vala
src/twitter_recursive_reply.vala
src/twitter_stream_abstract.vala
src/updates_cell_renderer.vala
src/vapi/config.vapi
src/view_area.vala
src/visual_style.vala
src/wscript [deleted file]

index 11880d8..e1bb6fb 100644 (file)
@@ -59,9 +59,9 @@ pkg_check_modules(LIBXML REQUIRED "libxml-2.0 >= 2.0")
 pkg_check_modules(WEBKIT REQUIRED "webkit-1.0 >= 1.0")
 pkg_check_modules(LIBUNIQUE REQUIRED "unique-1.0 >= 1.0")
 pkg_check_modules(GTKSPELL REQUIRED "gtkspell-2.0 >= 2.0")
-pkg_check_modules(REST REQUIRED "rest-0.6 >= 0.6")
-pkg_check_modules(RESTEXTRAS REQUIRED "rest-extras-0.6 >= 0.6")
-pkg_check_modules(LIBINDICATE "indicate >= 0.3")
+pkg_check_modules(REST REQUIRED "rest-0.7 >= 0.7.10")
+#pkg_check_modules(RESTEXTRAS REQUIRED "rest-extras-0.7 >= 0.7.10")
+#pkg_check_modules(LIBINDICATE "indicate >= 0.3")
 
 if(${LIBINDICATE_FOUND})
   message(STATUS "libindicate found, support enabled...")
@@ -95,9 +95,10 @@ PACKAGES
   libsoup-2.4
   libxml-2.0
   webkit-1.0
-  unique-1.0
   rest-0.6
-  rest-extras-0.6
+  unique-1.0
+  
+  #rest-extras-0.6
 OPTIONS
   --thread
   -g
@@ -122,7 +123,7 @@ add_definitions(
   ${GTKSPELL_CFLAGS}
   ${LIBINDICATE_CFLAGS}
   ${REST_CFLAGS}
-  ${RESTEXTRAS_CFLAGS}
+  #${RESTEXTRAS_CFLAGS}
 )
 
 link_libraries(
@@ -139,7 +140,7 @@ link_libraries(
   ${GTKSPELL_LIBRARIES}
   ${LIBINDICATE_LIBRARIES}
   ${REST_LIBRARIES}
-  ${RESTEXTRAS_LIBRARIES}
+  #${RESTEXTRAS_LIBRARIES}
 )
 
 include_directories(src/vapi/)
diff --git a/COPYING b/COPYING
index 4432540..fc8a5de 100644 (file)
--- a/COPYING
+++ b/COPYING
-
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 3, 29 June 2007
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                           Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  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
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  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.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                      TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-  
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  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.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                    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
-state 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 3 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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program 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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU 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.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/README b/README
index 18be529..6577254 100644 (file)
--- a/README
+++ b/README
@@ -3,5 +3,5 @@ README for Pino
 
 Pino is a fast, easy and free Twitter client.
 
-Visit http://code.google.com/p/pino-twitter/ for more information.
+Visit http://pino-app.appspot.com/ for more information.
 
index 4e6cc78..e69de29 100644 (file)
Binary files a/img/delete_status.png and b/img/delete_status.png differ
index 72e75c4..e69de29 100644 (file)
Binary files a/img/direct_reply.png and b/img/direct_reply.png differ
index 6e23a34..6e85627 100644 (file)
Binary files a/img/updating.png and b/img/updating.png differ
index ef72740..8028b3c 100644 (file)
@@ -6,7 +6,7 @@ using Gtk;
 public abstract class AAccount : GLib.Object {
 
        public signal void stream_was_added(AAccount account, AStream stream);
-       public signal void stream_was_removed(AAccount account, int stream_index);
+       public signal void stream_was_removed(AAccount account, AStream stream);
        public signal void fresh_items_changed(int items, int stream_index, AAccount account);
        public signal void account_was_changed(AAccount account);
        public signal void status_sent(AAccount account, bool ok, string error_msg = "");
@@ -14,6 +14,7 @@ public abstract class AAccount : GLib.Object {
        public signal void stop_indicate();
        public signal void do_reply(AAccount account, Status status);
        public signal void insert_reply(string stream_hash, string status_id, Status result);
+       public signal void cursor_changed(AStream? new_stream, AStream? old_stream);
        
        /* For tree widget */
        public signal void stream_was_changed(AAccount account, AStream stream, int stream_index);
@@ -27,8 +28,8 @@ public abstract class AAccount : GLib.Object {
        public string s_avatar_url {get; set; default = "";}
        
        /** Holdes list of current streams */
-       private ArrayList<AStream> _streams = new ArrayList<AStream>();
-       public ArrayList<AStream> streams {get { return _streams; } }
+       //private ArrayList<AStream> _streams = new ArrayList<AStream>();
+       public StreamsModel streams {get; set; default = new StreamsModel(); }
        
        /** Items in context menu of this account */
        public abstract MenuItems[] popup_items {owned get;}
@@ -48,7 +49,7 @@ public abstract class AAccount : GLib.Object {
        public virtual string s_name {get; set; default = "unknown";}
        
        /** Update interval in secs */
-       public virtual int s_update_interval {get; set; default = 3000;}
+       public virtual int s_update_interval {get; set; default = 60;}
        
        /** Account string id */
        public abstract string id {get; set;}
@@ -81,6 +82,10 @@ public abstract class AAccount : GLib.Object {
                        debug("userpic changed");
                        account_was_changed(this);
                });
+               
+               streams.cursor_changed.connect((new_stream, old_stream) => {
+                       cursor_changed(new_stream, old_stream);
+               });
        }
        
        /** Unique hash of stream+account */
@@ -127,7 +132,6 @@ public abstract class AAccount : GLib.Object {
 
                AStream stream = (AStream) GLib.Object.new(stype);
                stream.account = this;
-               streams.add(stream);
                
                if(props != null) {
                        var obj = (ObjectClass) stype.class_ref();
@@ -163,10 +167,12 @@ public abstract class AAccount : GLib.Object {
                });
                
                if(emit_signal) {
-                       stream_was_added(this, stream);
+                       //stream_was_added(this, stream);
                }
                
                init_stream(stream);
+               
+               streams.add(stream);
        }
        
        /** If we need to add some options to the stream */
@@ -184,24 +190,24 @@ public abstract class AAccount : GLib.Object {
        }
        
        /** Reaction on stream's popup menu actions */
-       public void streams_actions_tracker(int stream_index, MenuItems item) {
+       public void streams_actions_tracker(AStream stream, MenuItems item) {
                debug("action: %d", item);
                switch(item) {
                case MenuItems.REMOVE:
-                       stream_was_removed(this, stream_index);
-                       streams.remove_at(stream_index);
+                       //stream_was_removed(this, stream);
+                       streams.remove(stream);
                        break;
                
                case MenuItems.REFRESH:
-                       streams.get(stream_index).menu_refresh();
+                       stream.menu_refresh();
                        break;
                
                case MenuItems.SETTINGS:
-                       streams.get(stream_index).menu_settings();
+                       stream.menu_settings();
                        break;
                
                case MenuItems.MORE:
-                       streams.get(stream_index).menu_more();
+                       stream.menu_more();
                        break;
                }
        }
index 8e15cf2..0e15908 100644 (file)
@@ -6,7 +6,7 @@ public class Accounts : ArrayList<AAccount> {
        
        public signal void insert_new_account(AAccount account);
        public signal void insert_new_stream_after(string after_path, AStream stream);
-       public signal void element_was_removed(string path, AAccount account, AStream? stream = null);
+       public signal void account_was_removed(AAccount account);
        public signal void fresh_items_changed(int items, string path);
        public signal void account_was_changed(string path, AAccount account);
        public signal void stream_was_changed(string path, AStream stream);
@@ -16,6 +16,36 @@ public class Accounts : ArrayList<AAccount> {
        public signal void stop_indicate();
        public signal void do_reply(AAccount account, Status status);
        public signal void insert_reply(string stream_hash, string status_id, Status result);
+       public signal void cursor_changed(AStream? new_stream, AStream? old_stream);
+       public signal void current_changed(AAccount? new_account, AAccount? old_account);
+       
+       private AAccount? _current = null;
+       public AAccount? current {
+               get {
+                       return _current;
+               }
+               set {
+                       if(value == _current)
+                               return;
+                       
+                       if(contains(value)) {
+                               current_changed(value, _current); //emit signal
+                               
+                               if(value != null) {
+                                       AStream? old_stream = _current.streams.get_current();
+                                       AStream? new_stream = null;
+                                       
+                                       new_stream = value.streams.get_current();
+                                       value.streams.cursor_changed(new_stream, old_stream);
+                               }
+                               
+                               _current = value;
+                               settings.current_account = index_of(_current);
+                       } else {
+                               debug("no account");
+                       }
+               }
+       }
        
        private string accounts_path;
        
@@ -23,7 +53,23 @@ public class Accounts : ArrayList<AAccount> {
                base();
                
                init();
+               
+               if(this.size -1 >= settings.current_account) {
+                       current = get(settings.current_account);
+               }
        }
+       /*
+       public void set_current(AAccount? account) {
+               if(account == current)
+                       return;
+               
+               if(contains(account)) {
+                       current_changed(account, current); //emit signal
+                       current = account;
+               } else {
+                       debug("no account");
+               }
+       }*/
        
        private void init() {
                string app_dir = Environment.get_user_config_dir() + "/%s".printf(Config.APPNAME);
@@ -287,9 +333,11 @@ public class Accounts : ArrayList<AAccount> {
                
                prepare_account(account);
                account.post_install();
-               insert_new_account(account); //signal for tree and others
                
                add(account);
+               
+               insert_new_account(account); //emit signal
+               current = account;
        }
        
        private void prepare_account(AAccount account) {
@@ -315,6 +363,10 @@ public class Accounts : ArrayList<AAccount> {
                account.insert_reply.connect((stream_hash, status_id, result) => {
                        insert_reply(stream_hash, status_id, result);
                });
+               
+               account.cursor_changed.connect((new_stream, old_stream) => {
+                       cursor_changed(new_stream, old_stream);
+               });
        }
 
        /** New stream was added, we need to report about this to the tree widget */
@@ -324,10 +376,10 @@ public class Accounts : ArrayList<AAccount> {
        }
        
        /** Stream was removed from some account */
-       private void remove_stream(AAccount account, int stream_index) {
+       private void remove_stream(AAccount account, AStream stream) {
                int account_index = index_of(account);
-               AStream stream = account.streams.get(stream_index);
-               element_was_removed("%d:%d".printf(account_index, stream_index), account, stream);
+               //AStream stream = account.streams.get(stream_index);
+               //element_was_removed("%d:%d".printf(account_index, account.streams.index_of(stream)), account, stream);
        }
        
        /** New data in account */
@@ -397,12 +449,11 @@ public class Accounts : ArrayList<AAccount> {
        }
        
        /** Action for accounts */
-       public virtual void actions_tracker(AAccount account, MenuItems item,
-               Gtk.Window parent) {
+       public void actions_tracker(AAccount account, MenuItems item) {
                
                switch(item) {
                case MenuItems.REMOVE:
-                       Gtk.MessageDialog dlg = new Gtk.MessageDialog(parent, Gtk.DialogFlags.MODAL,
+                       Gtk.MessageDialog dlg = new Gtk.MessageDialog(main_window, Gtk.DialogFlags.MODAL,
                                Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO,
                                _("Do you realy want to remove this account?"));
                        
@@ -412,7 +463,7 @@ public class Accounts : ArrayList<AAccount> {
                        if(result == Gtk.ResponseType.YES) {
                                debug("remove");
                                int account_index = index_of(account);
-                               element_was_removed(account_index.to_string(), account);
+                               account_was_removed(account);
                                this.remove(account);
                        }
                        break;
diff --git a/src/accounts_widget.vala b/src/accounts_widget.vala
new file mode 100644 (file)
index 0000000..c5e100c
--- /dev/null
@@ -0,0 +1,950 @@
+using Gtk;
+using Cairo;
+using PinoEnums;
+using Gee;
+
+public class StreamIcon : EventBox, Redrawable {
+       
+       private const double TEXT_W_OFFSET = 6;
+       private const double TEXT_H_OFFSET = 3;
+       private const double FRESH_W_OFFSET = 4;
+       private const double FRESH_H_OFFSET = 10;
+       private double MAX_RGB = (double) uint16.MAX;
+       private const int RADIUS = 5;
+       private const double M_PI = 3.1415926535;
+       
+       public signal void activated(AStream stream);
+       
+       public AStream stream;
+       
+       //private Menu? menu = null;
+       
+       private Gdk.Pixbuf? status_icon = null;
+       
+       private Gdk.Pixbuf? icon = null;
+       private Gdk.Pixbuf? icon_inactive = null;
+       private Gdk.Pixbuf? icon_hovered = null;
+       private Gdk.Pixbuf? icon_pressed = null;
+       private Gdk.Pixbuf? icon_active_hovered = null;
+       
+       private Gdk.Pixbuf? icon_tmp = null;
+       
+       private int size = 48;
+       
+       public State state = State.INACTIVE;
+       
+       private bool checked {get; set; default = false;}
+       
+       public static enum State {
+               ACTIVE,
+               ACTIVE_HOVERED,
+               INACTIVE,
+               HOVERED,
+               PRESSED
+       }
+       
+       public StreamIcon(AStream stream, string tooltip, owned Gdk.Pixbuf icon,
+               int size = 48) {
+               
+               this.stream = stream;
+               
+               set_tooltip_text(tooltip);
+               
+               if(icon.width > size - 20)
+                       icon = icon.scale_simple(size - 20, size - 20, Gdk.InterpType.BILINEAR);
+               
+               this.icon = icon;
+               
+               this.size = size;
+               
+               set_size_request(size, size);
+               set_has_window(false);
+               
+               icon_hovered = new Gdk.Pixbuf(Gdk.Colorspace.RGB, icon.has_alpha, icon.bits_per_sample, icon.width, icon.height);
+               icon.saturate_and_pixelate(icon_hovered, (float) 1.5, false);
+               //icon.composite(icon_hovered, 0, 0, icon.width, icon.height, 0, 0, 1, 1, Gdk.InterpType.NEAREST, 100);
+               
+               icon_pressed = icon.scale_simple(icon.width - 2, icon.height - 2, Gdk.InterpType.BILINEAR);
+               
+               set_events(Gdk.EventMask.ENTER_NOTIFY_MASK);
+               set_events(Gdk.EventMask.LEAVE_NOTIFY_MASK);
+               set_events(Gdk.EventMask.BUTTON_PRESS_MASK);
+               set_events(Gdk.EventMask.BUTTON_RELEASE_MASK);
+               
+               enter_notify_event.connect(on_enter);
+               leave_notify_event.connect(on_leave);
+               button_press_event.connect(on_press);
+               button_release_event.connect(on_release);
+               
+               this.stream.notify["status"].connect(set_status);
+               //this.notify["checked"].connect(set_checked);
+               this.stream.notify["fresh-items"].connect(fresh_items_changed);
+               
+               if(stream.status != StreamStatus.READY) {
+                       ParamSpec? pspec = null;
+                       set_status(pspec);
+               }
+       }
+       
+       public void set_checked_simple(bool checked) {
+               this.checked = checked;
+               
+               if(checked)
+                       state = State.ACTIVE;
+               else
+                       state = State.INACTIVE;
+               
+               redraw();
+       }
+       
+       private void set_status(ParamSpec? pspec) {
+               switch(stream.status) {
+               case StreamStatus.READY:
+                       status_icon = null;
+                       break;
+               
+               case StreamStatus.UPDATING:
+                       status_icon = new Gdk.Pixbuf.from_file(Config.UPDATING_PATH);
+                       break;
+               }
+               
+               redraw();
+       }
+       
+       private void fresh_items_changed(ParamSpec? pspec) {
+               //debug("=======================%i", stream.fresh_items);
+               redraw();
+       }
+       
+       private bool on_enter(Gdk.EventCrossing event) {
+               if(checked)
+                       state = State.ACTIVE_HOVERED;
+               else
+                       state = State.HOVERED;
+               
+               redraw();
+               
+               return false;
+       }
+       
+       private bool on_leave(Gdk.EventCrossing event) {
+               if(checked)
+                       state = State.ACTIVE;
+               else
+                       state = State.INACTIVE;
+               
+               redraw();
+               return false;
+       }
+       
+       private bool on_press(Gdk.EventButton event) {
+               switch(event.button) {
+               case 1:
+                       state = State.PRESSED;
+                       redraw();
+                       activated(stream); //emit signal
+                       return true;
+               case 3:
+                       context_menu(event);
+                       return true;
+               }
+               
+               
+               //state = State.ACTIVE;
+               return true;
+       }
+       
+       public void activate() {
+               
+       }
+       
+       private bool on_release(Gdk.EventButton event) {
+               return true;
+       }
+       
+       private bool context_menu(Gdk.EventButton event) {
+               Menu menu = new Menu();
+               
+               foreach(MenuItems item in stream.popup_items) {
+                       MenuItems sitem = item;
+                       debug("action: %d", sitem);
+                       ImageMenuItem menu_item = item2menu(sitem);
+                       
+                       menu_item.activate.connect(() => {
+                               stream.account.streams_actions_tracker(stream, sitem);
+                       });
+                       menu.append(menu_item);
+               }
+               
+               menu.show_all();
+               debug("%d", (int) event.time);
+               menu.popup(null, null, null, 1, event.time);
+               
+               return true;
+       }
+       
+       public static ImageMenuItem item2menu(MenuItems item) {
+               string label = "";
+               
+               switch(item) {
+               case MenuItems.SETTINGS:
+                       label = _("Settings...");
+                       break;
+               
+               case MenuItems.REMOVE:
+                       label = _("Remove");
+                       break;
+               
+               case MenuItems.REFRESH:
+                       label = _("Refresh");
+                       break;
+               
+               case MenuItems.MORE:
+                       label = _("Get more");
+                       break;
+               }
+               
+               ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
+               
+               return menu_item;
+       }
+       
+       public override bool expose_event(Gdk.EventExpose event) {
+               Context ctx = Gdk.cairo_create(this.window);
+               
+               Allocation alloc;
+               get_allocation(out alloc);
+               
+               /*
+               Gdk.Color color = {1, 240, 119, 70};
+               Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y, alloc.width, alloc.height});
+               
+               Cairo.Pattern grad = new Cairo.Pattern.linear(alloc.x, alloc.y, alloc.x, alloc.height);
+               grad.add_color_stop_rgba(0, color.red/256.0, color.green/256.0, color.blue/256.0, 1.0);
+               grad.add_color_stop_rgba(0.5, color.red/256.0, color.green/256.0, color.blue/256.0, 0.5);
+               grad.add_color_stop_rgba(1, color.red/256.0, color.green/256.0, color.blue/256.0, 1.0);
+               
+               ctx.set_source(grad);
+               
+               ctx.fill();
+               */
+               base.expose_event(event);
+               
+               switch(state) {
+               case State.INACTIVE:
+                       icon_tmp = icon;//_inactive;
+                       break;
+               case State.ACTIVE:
+                       Gdk.Color color = {1, 242, 241, 240};
+                       draw_rect(ctx, alloc, color);
+                       icon_tmp = icon;
+                       break;
+               case State.ACTIVE_HOVERED:
+                       Gdk.Color color = {1, 254, 253, 252};
+                       draw_rect(ctx, alloc, color);
+                       icon_tmp = icon_hovered;//icon_active_hovered;
+                       break;
+               case State.HOVERED:
+                       Gdk.Color color = {1, 229, 226, 224};
+                       //draw_rect(ctx, alloc, color);
+                       icon_tmp = icon_hovered;
+                       break;
+               case State.PRESSED:
+                       Gdk.Color color = {1, 229, 226, 224};
+                       draw_rect(ctx, alloc, color);
+                       icon_tmp = icon_pressed;
+                       break;
+               }
+               
+               if(icon_tmp != null) {
+                       Gdk.Rectangle big_rect = {alloc.x + (alloc.width - icon.width) / 2,
+                               alloc.y + (alloc.height - icon.height) / 2 , icon.width, icon.height};
+                       Gdk.cairo_rectangle(ctx, big_rect);
+                       Gdk.cairo_set_source_pixbuf(ctx, icon_tmp, big_rect.x,
+                               big_rect.y);
+                       
+                       ctx.fill();
+                       
+                       
+                       if(status_icon != null) {
+                               Gdk.Rectangle status_rect = {big_rect.x + big_rect.width - status_icon.width,
+                                       big_rect.y + big_rect.height - status_icon.height, status_icon.width,
+                                       status_icon.height};
+                               
+                               Gdk.cairo_rectangle(ctx, status_rect);
+                               Gdk.cairo_set_source_pixbuf(ctx, status_icon, status_rect.x,
+                                       status_rect.y);
+                               
+                               ctx.fill();
+                       }
+               }
+               
+               //draw fresh items
+               if(stream.fresh_items > 0) {
+                       Pango.FontDescription font_desc = style.font_desc;
+                       string fresh_string = stream.fresh_items.to_string();
+                       
+                       Gdk.Color fg_color = style.fg[Gtk.StateType.SELECTED];
+                       Gdk.Color bg_color = style.bg[Gtk.StateType.SELECTED];
+                       Gdk.Color border_color = make_darker(bg_color, 20);
+                       
+                       ctx.select_font_face(font_desc.get_family(), FontSlant.NORMAL, FontWeight.BOLD);
+                       ctx.set_font_size(font_desc.get_size() / 1000);
+                       
+                       //text margins
+                       TextExtents ex_up;
+                       ctx.text_extents(fresh_string, out ex_up);
+               
+                       int area_width = (int) (ex_up.width + TEXT_W_OFFSET * 2);
+                       
+                       //draw rect
+                       double height = ex_up.height + TEXT_H_OFFSET * 2;
+                       double rect_w = ex_up.width + TEXT_W_OFFSET * 2;
+                       ctx.set_line_width(0.5);
+                       draw_rounded_rect(ctx, bg_color, alloc.x + alloc.width - rect_w - FRESH_W_OFFSET,
+                               alloc.y + (alloc.height - height) / 2.0 - FRESH_H_OFFSET,
+                               rect_w, height, RADIUS, border_color);
+               
+                       //draw text
+                       ctx.set_source_rgb(fg_color.red / MAX_RGB, fg_color.green / MAX_RGB,
+                               fg_color.blue / MAX_RGB);
+               
+                       ctx.move_to(alloc.x - TEXT_W_OFFSET + alloc.width - ex_up.width - FRESH_W_OFFSET,
+                               alloc.y + (alloc.height + ex_up.height) / 2.0 - FRESH_H_OFFSET);
+                       ctx.show_text(fresh_string);
+               }
+               
+               return false;
+       }
+       
+       private void draw_rounded_rect(Context ctx, Gdk.Color bg_color, double x,
+               double y, double width, double height, double radius,
+                       Gdk.Color? border_color = null) {
+               
+               double degrees = M_PI / 180.0;
+               
+               ctx.new_sub_path();
+               ctx.arc(x + width - radius, y + radius, radius, -90 * degrees, 0 * degrees);
+               ctx.arc(x + width - radius, y + height - radius, radius, 0 * degrees, 90 * degrees);
+               ctx.arc(x + radius, y + height - radius, radius, 90 * degrees, 180 * degrees);
+               ctx.arc(x + radius, y + radius, radius, 180 * degrees, 270 * degrees);
+               ctx.close_path();
+               
+               set_color(ctx, bg_color);
+               
+               ctx.fill_preserve();
+               
+               if(border_color != null) {
+                       set_color(ctx, border_color);
+                       ctx.stroke_preserve();
+               }
+       }
+       
+       private void set_color(Context ctx, Gdk.Color color) {
+               //get rgb
+               double r = (double) color.red / MAX_RGB;
+               double g = (double) color.green / MAX_RGB;
+               double b = (double) color.blue / MAX_RGB;
+               
+               ctx.set_source_rgb(r, g, b);
+       }
+       
+       public static Gdk.Color make_darker(Gdk.Color color, int percent) {
+               if(percent > 99)
+                       percent = 99;
+               
+               Gdk.Color new_color = color;
+               
+               new_color.red = color.red - (color.red / 100) * percent;
+               new_color.green = color.green - (color.green / 100) * percent;
+               new_color.blue = color.blue - (color.blue / 100) * percent;
+               
+               if(new_color.red < 0)
+                       new_color.red = 0;
+               if(new_color.green < 0)
+                       new_color.green = 0;
+               if(new_color.blue < 0)
+                       new_color.blue = 0;
+               
+               return new_color;
+       }
+       
+       private void draw_rect(Context ctx, Allocation alloc, Gdk.Color color) {
+               Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y, alloc.width, alloc.height});
+               
+               Cairo.Pattern grad = new Cairo.Pattern.linear(alloc.x, alloc.y, alloc.x, alloc.height);
+               grad.add_color_stop_rgba(0, color.red/256.0, color.green/256.0, color.blue/256.0, 1.0);
+               grad.add_color_stop_rgba(0.5, color.red/256.0, color.green/256.0, color.blue/256.0, 0.5);
+               grad.add_color_stop_rgba(1, color.red/256.0, color.green/256.0, color.blue/256.0, 1.0);
+               
+               ctx.set_source(grad);
+               
+               ctx.fill();
+               
+               //draw top and bottom lines
+               Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y, alloc.x + alloc.width, 1});
+               ctx.set_source_rgb(178/256.0, 176/256.0, 164/256.0);
+               ctx.fill_preserve();
+               
+               Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y + alloc.height, alloc.x + alloc.width, 1});
+               ctx.set_source_rgb(178/256.0, 176/256.0, 164/256.0);
+               ctx.fill_preserve();
+       }
+}
+
+public class StreamsWidget : VBox {
+       
+       public signal void activated(AStream stream);
+       
+       private AAccount account;
+       
+       //public AStream? current_stream = null;
+       
+       public StreamsWidget(AAccount account) {
+               GLib.Object(homogeneous: false, spacing: 0);
+               
+               this.account = account;
+               
+               //setup streams
+               foreach(AStream stream in account.streams) {
+                       new_stream_icon(stream);
+               }
+               
+               account.streams.cursor_changed.connect(move_cursor);
+               account.streams.removed.connect(stream_removed);
+               account.streams.added.connect(stream_added);
+               
+               show_all();
+       }
+       
+       private void new_stream_icon(AStream stream) {
+               StreamIcon icon = create_icon(stream);
+               icon.activated.connect(on_activated);
+               icon.show_all();
+               pack_start(icon, false, false, 0);
+       }
+       
+       private void move_cursor(AStream? new_stream, AStream? old_stream) {
+               StreamIcon? icon = stream_icon_from_stream(new_stream);
+               if(icon != null)
+                       icon.set_checked_simple(true);
+               
+               icon = stream_icon_from_stream(old_stream);
+               if(icon != null)
+                       icon.set_checked_simple(false);
+       }
+       
+       private void stream_removed(AStream stream) {
+               StreamIcon? icon = stream_icon_from_stream(stream);
+               
+               if(icon != null) {
+                       remove(icon);
+                       icon.dispose();
+               }
+               
+               debug("removed");
+       }
+       
+       private void stream_added(AStream stream) {
+               new_stream_icon(stream);
+       }
+       
+       public void on_activated(AStream stream) {
+               if(stream == account.streams.get_current())
+                       return;
+               
+               account.streams.set_current(stream);
+               debug("set current stream");
+               /*
+               if(current_stream != null) {
+                       StreamIcon? icon = stream_icon_from_stream(current_stream);
+                       debug("ok");
+                       if(icon != null) {
+                               icon.set_checked_simple(false);
+                               debug("ok");
+                       }
+               }
+               
+               current_stream = stream;
+               activated(stream);      
+               */
+       }
+       
+       private StreamIcon? stream_icon_from_stream(AStream? stream) {
+               if(stream == null)
+                       return null;
+               
+               foreach(Widget i in this.get_children()) {
+                       if(i.get_type() != typeof(StreamIcon))
+                               continue;
+                       
+                       if(((StreamIcon) i).stream == stream) {
+                                       return (StreamIcon) i;
+                       }
+               }
+               
+               return null;
+       }
+       
+       private StreamIcon create_icon(AStream stream) {
+               Gdk.Pixbuf pic = streams_types[stream.stream_type].icon;
+               string tooltip = streams_types[stream.stream_type].name;
+               StreamIcon icon = new StreamIcon(stream, tooltip, pic);
+               //icon.show();
+               return icon;
+       }
+}
+
+public class AccountWidget : EventBox, Redrawable {
+       
+       public AAccount account;
+       private Accounts accounts;
+       private Avatar avatar;
+       
+       public bool active {get; set; default = false;}
+       
+       public signal void account_activate(AccountWidget acc_widget);
+       
+       public class AccountWidget(AAccount account, Accounts accounts) {
+               this.account = account;
+               this.accounts = accounts;
+               
+               set_size_request(48, 48);
+               
+               avatar = new Avatar.from_url(this.account.s_avatar_url, 48);
+               avatar.show();
+               
+               add(avatar);
+               
+               notify["active"].connect(on_active);
+               
+               set_events(Gdk.EventMask.BUTTON_PRESS_MASK);
+               button_press_event.connect(on_press);
+               
+               set_has_window(false);
+       }
+       
+       private bool on_press(Gdk.EventButton event) {
+               switch(event.button) {
+               case 1:
+                       if(active)
+                               return true;
+                       
+                       active = true;
+                       account_activate(this); //emit signal
+                       break;
+               case 3:
+                       context_menu(event);
+                       break;
+               }
+               
+               return true;
+       }
+       /*
+       private bool on_release(Gdk.EventButton event) {
+               
+               
+               return true;
+       }*/
+       
+       public void on_active(ParamSpec? pspec = null) {
+               avatar.set_active(active);
+               redraw();
+       }
+    
+       private bool context_menu(Gdk.EventButton event) {
+               Menu menu = new Menu();
+               
+               Menu streams_menu = new Menu(); //for streams
+               
+               foreach(StreamEnum stream in account.avaliable_streams().keys) {
+                       string label = streams_types.get(stream).name;
+                       ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
+                       menu_item.set_always_show_image(true);
+                       Image img = streams_types.get(stream).get_menu_image();
+                       
+                       if(img != null)
+                               menu_item.set_image(img);
+                       
+                       menu_item.activate.connect(() => { //add new stream to account
+                               account.add_stream(stream, true);
+                       });
+                       streams_menu.append(menu_item);
+               }
+               
+               MenuItem streams_item = new MenuItem.with_label("Add stream");
+               streams_item.set_submenu(streams_menu);
+               menu.append(streams_item);
+               
+               foreach(MenuItems item in account.popup_items) {
+                       MenuItems aitem = item;
+                       MenuItem? menu_item = StreamIcon.item2menu(item); //static method
+                       
+                       menu_item.activate.connect(() => {
+                               accounts.actions_tracker(account, aitem);
+                       });
+                       
+                       if(menu_item != null)
+                               menu.append(menu_item);
+                       else
+                               debug("item doesn't supported");
+               }
+               
+               menu.show_all();
+               menu.popup(null, null, null, 1, event.time);
+               
+               return true;
+       }
+       
+       /*
+       public override bool expose_event(Gdk.EventExpose event) {
+               base.expose_event(event);
+               
+               Context ctx = Gdk.cairo_create(this.window);
+               
+               Allocation alloc;
+               get_allocation(out alloc);
+               
+               if(!active) {
+                       Avatar.draw_rounded_path(ctx, 0, 0, alloc.width,
+                               alloc.height, 4);
+                       ctx.set_source_rgba(242 / 256.0, 241 / 256.0, 240 / 256.0, 0.6);
+                       ctx.fill_preserve();
+               }
+               
+               return true;
+       }*/
+}
+
+public class StreamsModel : ArrayList<AStream> {
+       
+       private AStream? current_stream {get; set; default = null;}
+       
+       public signal void added(AStream stream);
+       public signal void removed(AStream stream);
+       public signal void cursor_changed(AStream? new_stream, AStream? old_stream);
+       
+       public StreamsModel() {
+               base();
+       }
+       
+       public override bool add(AStream stream) {
+               base.add(stream);
+               
+               added(stream);
+               
+               set_current(stream);
+               
+               return true;
+       }
+       
+       public override bool remove(AStream stream) {
+               removed(stream);
+               
+               base.remove(stream);
+               
+               if(current_stream == stream) {
+                       if(this.size < 1)
+                               set_current(null);
+                       else {
+                               this.set_current(this.get(0));
+                       }
+               }
+               
+               return true;
+       }
+       
+       public void set_current(AStream? stream) {
+               debug("ok");
+               if(stream == current_stream)
+                       return;
+               debug("ok");
+               if(contains(stream)) {
+                       debug("ok");
+                       cursor_changed(stream, current_stream); //emit signal
+                       current_stream = stream;
+               }
+               else
+                       debug("no such stream");
+       }
+       
+       public AStream? get_current() {
+               if(current_stream == null) {
+                       if(this.size == 0)
+                               return null;
+                       
+                       this.set_current(this.get(0));
+               }
+               
+               return current_stream;
+       }
+}
+
+public class AccountsWidget : EventBox {
+       
+       public signal void cursor_moved(AAccount account, AStream? stream);
+       
+       private Accounts accounts;
+       
+       //private AAccount? current_account = null;
+       
+       private VBox main_vb;
+       private VBox top_acc;
+       private HBox top_acc_h;
+       private VBox streams_box;
+       private VBox bottom_acc;
+       private HBox bottom_acc_h;
+       
+       private HashMap<AAccount, StreamsWidget> accounts_map {get; set; default = new HashMap<AAccount, StreamsWidget>();}
+       
+       public AccountsWidget(Accounts accounts) {
+               this.accounts = accounts;
+               
+               set_size_request(56, 100);
+               set_has_window(false);
+               
+               main_vb = new VBox(false, 4);
+               top_acc = new VBox(false, 2);
+               top_acc_h = new HBox(false, 2);
+               streams_box = new VBox(false, 0);
+               bottom_acc_h = new HBox(false, 2);
+               bottom_acc = new VBox(false, 2);
+               
+               top_acc.pack_start(top_acc_h, false, false, 4);
+               bottom_acc_h.pack_start(bottom_acc, false, false, 4);
+               
+               main_vb.pack_start(top_acc, false, false, 2);
+               main_vb.pack_start(streams_box, false, false, 0);
+               main_vb.pack_end(bottom_acc_h, false, false, 0);
+               /*
+               if(accounts.size > 0) {
+                       current_account = accounts.get(0);
+                       AccountWidget aw = new AccountWidget(current_account);
+                       aw.account_activate.connect(on_account_activate);
+                       top_acc.pack_start(aw, false, false, 0);
+                       aw.show();
+                       aw.active = true;
+                       
+                       StreamsWidget sw = setup_streams(accounts.get(0));
+                       accounts_map.set(accounts.get(0), sw);
+                       streams_box.pack_start(sw, false, false, 0);
+               }*/
+               
+               if(accounts.size - 1 < settings.current_account)
+                       settings.current_account = 0;
+               
+               //accounts setup
+               foreach(AAccount account in accounts) {
+                       //if(account == current_account)
+                       //      continue;
+                       /*
+                       AccountWidget aw = new AccountWidget(account, accounts);
+                       aw.account_activate.connect(on_account_activate);
+                       
+                       StreamsWidget sw = setup_streams(account);
+                       accounts_map.set(account, sw);
+                       
+                       if(accounts.index_of(account) == settings.current_account) {
+                               current_account = account;
+                               top_acc_h.pack_start(aw, false, false, 4);
+                               aw.active = true;
+                               
+                               streams_box.pack_start(sw, false, false, 0);
+                       } else {
+                               bottom_acc.pack_start(aw, false, false, 4);
+                               aw.active = false;
+                       }
+                       
+                       aw.show();*/
+                       add_account(account);
+               }
+               
+               add(main_vb);
+               
+               accounts.account_was_removed.connect(remove_account);
+               accounts.insert_new_account.connect(add_account);
+               accounts.current_changed.connect(current_changed);
+       }
+       
+       private void add_account(AAccount account) {
+               AccountWidget aw = new AccountWidget(account, accounts);
+               //aw.account_activate.connect(on_account_activate);
+               aw.account_activate.connect(account_activate);
+               
+               StreamsWidget sw = setup_streams(account);
+               accounts_map.set(account, sw);
+               
+               if(account == accounts.current) {
+                       //current_account = account;
+                       top_acc_h.pack_start(aw, false, false, 4);
+                       aw.active = true;
+                       
+                       streams_box.pack_start(sw, false, false, 0);
+               } else {
+                       bottom_acc.pack_start(aw, false, false, 2);
+                       aw.active = false;
+               }
+               
+               aw.show();
+       }
+       
+       private void remove_account(AAccount account) {
+               AccountWidget rw = widget_from_account(account);
+               StreamsWidget sw = accounts_map.get(account);
+               
+               if(accounts.current == account) {
+                       top_acc_h.remove(rw);
+                       streams_box.remove(sw);
+                       
+                       accounts.current = null;
+                       
+                       if(bottom_acc.get_children().length() > 0) {
+                               ((AccountWidget) bottom_acc.get_children().nth_data(0)).on_active();
+                       }
+                       //current_account = null;
+               } else {
+                       bottom_acc.remove(rw);
+               }
+       }
+       
+       private StreamsWidget setup_streams(AAccount account) {
+               StreamsWidget stream_widget = new StreamsWidget(account);
+               stream_widget.activated.connect(stream_activate);
+               
+               return stream_widget;
+       }
+       
+       public void setup_current_stream() {
+               if(accounts.current == null)
+                       return;
+               
+               if(accounts.current.streams.size < 1)
+                       return;
+               
+               accounts.current.streams.set_current(accounts.current.streams.get(0));
+       }
+       
+       private void account_activate(AccountWidget acc_widget) {
+               accounts.current = acc_widget.account;
+       }
+       
+       private void current_changed(AAccount? new_account, AAccount? old_account) {
+               if(old_account == null)
+                       return;
+               
+               AccountWidget? old_widget = widget_from_account(old_account);
+               if(old_widget != null) {
+                       top_acc_h.remove(old_widget);
+                       old_widget.active = false;
+                       bottom_acc.pack_start(old_widget, false, false, 2);
+                       
+                       if(streams_box.get_children().length() == 1) {
+                               streams_box.remove(streams_box.get_children().nth_data(0));
+                       }
+               }
+               
+               if(new_account == null)
+                       return;
+               
+               AccountWidget? new_widget = widget_from_account(new_account);
+               if(new_widget != null) {
+                       bottom_acc.remove(new_widget);
+                       top_acc_h.pack_start(new_widget, false, false, 4);
+                       
+                       new_widget.active = true;
+                       streams_box.pack_start(accounts_map.get(new_account), false, false, 0);
+               }
+               
+               AStream? old_stream = old_account.streams.get_current();
+               AStream? stream = new_account.streams.get_current();
+               
+               if(stream == null)
+                       return;
+               
+               new_account.streams.cursor_changed(stream, old_stream);
+       }
+       
+       /*private void on_account_activate(AccountWidget acc_widget) {
+               AccountWidget? tmp_widget = widget_from_account(accounts.current);
+               if(tmp_widget != null) {
+                       top_acc_h.remove(tmp_widget);
+                       tmp_widget.active = false;
+                       bottom_acc.pack_start(tmp_widget, false, false, 0);
+                       
+                       if(streams_box.get_children().length() == 1) {
+                               streams_box.remove(streams_box.get_children().nth_data(0));
+                       }
+               }
+               
+               bottom_acc.remove(acc_widget);
+               top_acc_h.pack_start(acc_widget, false, false, 4);
+               
+               AStream? old_stream = accounts.current.streams.get_current(); //get old active stream
+               
+               accounts.current = acc_widget.account;
+               
+               if(accounts.current != null)
+                       settings.current_account = accounts.index_of(accounts.current); //write to settings
+               
+               streams_box.pack_start(accounts_map.get(accounts.current), false, false, 0);
+               
+               AStream? stream = accounts.current.streams.get_current();
+               
+               if(stream == null)
+                       return;
+               
+               accounts.current.streams.cursor_changed(stream, old_stream);
+       }*/
+       
+       private AccountWidget? widget_from_account(AAccount account) {
+               foreach(Widget aw in top_acc_h.get_children()) {
+                       if(((AccountWidget) aw).account == account)
+                               return (AccountWidget) aw;
+               }
+               
+               foreach(Widget aw in bottom_acc.get_children()) {
+                       if(((AccountWidget) aw).account == account)
+                               return (AccountWidget) aw;
+               }
+               
+               return null;
+       }
+       
+       private void stream_activate(AStream stream) {
+               //cursor_moved(stream.account, stream); //emit signal
+       }
+       
+       public override bool expose_event(Gdk.EventExpose event) {
+               Context ctx = Gdk.cairo_create(this.window);
+               
+               Allocation alloc;
+               get_allocation(out alloc);
+               Gdk.Color color = {1, 230, 224, 218};
+               Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y, alloc.width, alloc.height});
+               /*
+               Cairo.Pattern grad = new Cairo.Pattern.linear(0, 1, alloc.width, 1);
+               grad.add_color_stop_rgb(0, color.red/256.0, color.green/256.0, color.blue/256.0);
+               grad.add_color_stop_rgb(0.5, 212/256.0, 211/256.0, 210/256.0);
+               grad.add_color_stop_rgb(1, color.red/256.0, color.green/256.0, color.blue/256.0);
+               
+               ctx.set_source(grad);*/
+               ctx.set_source_rgb(230/256.0, 224/256.0, 218/256.0);
+               ctx.fill();
+               
+               base.expose_event(event);
+               
+               Gdk.cairo_rectangle(ctx, {alloc.width - 1, alloc.y, 1, alloc.height});
+               ctx.set_source_rgb(178/256.0, 176/256.0, 164/256.0);
+               ctx.fill_preserve();
+               
+               Gdk.cairo_rectangle(ctx, {alloc.width - 2, alloc.y, 1, alloc.height});
+               ctx.set_source_rgba(178/256.0, 176/256.0, 164/256.0, 0.4);
+               ctx.fill_preserve();
+               
+               Gdk.cairo_rectangle(ctx, {alloc.width - 3, alloc.y, 1, alloc.height});
+               ctx.set_source_rgba(178/256.0, 176/256.0, 164/256.0, 0.2);
+               ctx.fill_preserve();
+               
+               return true;
+       }
+}
index 4a1ebf4..445b173 100644 (file)
@@ -2,18 +2,25 @@ using Gtk;
 using Cairo;
 
 /** Special class for avatars. With rounded corners and shadows */
-public class Avatar : Image {
+public class Avatar : Image, Redrawable {
        
        public string url {get; set; default = "";}
        public int pix_size {get; set; default = 1;}
        
-       private const double M_PI = 3.1415926535;
-       private const double MAX_RGB = (double) uint16.MAX;
+       public static const double M_PI = 3.1415926535;
+       public static double MAX_RGB = (double) uint16.MAX;
        
-       private unowned Thread? thread = null;
+       private bool active = true;
+       private Gdk.Pixbuf? ipixbuf = null;
+       private Gdk.Pixbuf? cpixbuf = null;
        
-       public Avatar() {
+       private unowned Thread<void*>? thread = null;
+       
+       public Avatar(int pix_size) {
                GLib.Object();
+               this.pix_size = pix_size;
+               
+               set_size_request(pix_size, pix_size);
        }
        
        public Avatar.from_url(string url, int pix_size) {
@@ -25,6 +32,11 @@ public class Avatar : Image {
                load_pic();
        }
        
+       public void set_from_url(string url) {
+               this.url = url;
+               load_pic();
+       }
+       
        public void set_file_name(string file_name) {
                //this.set_from_file(file_name);
                pixbuf = img_cache.from_cache(file_name);
@@ -33,14 +45,35 @@ public class Avatar : Image {
                        pixbuf = pixbuf.scale_simple(pix_size, pix_size, Gdk.InterpType.BILINEAR);
                }
                
+               set_active(active);
+               
+               //pixbuf = pixbuf.add_alpha(false, 0xff, 0xff, 0xff);
+               
+               redraw();
+       }
+       
+       public void set_active(bool active) {
+               this.active = active;
+               
+               if(active) {
+                       cpixbuf = pixbuf;
+               } else {
+                       if(ipixbuf == null && pixbuf != null) {
+                               ipixbuf = pixbuf.composite_color_simple (pixbuf.width, pixbuf.height, Gdk.InterpType.BILINEAR, 50, 24, 0xd9d7d5, 0xd9d7d5);
+                       }
+                       
+                       cpixbuf = ipixbuf;
+               }
+               
                redraw();
        }
        
        public override bool expose_event(Gdk.EventExpose event) {
                Context ctx = Gdk.cairo_create(this.window);
                
-               if(pixbuf != null) {
-                       if(!pixbuf.has_alpha) {
+               if(cpixbuf != null) {
+                       /*
+                       if(false) {//!pixbuf.has_alpha) {
                                draw_rounded_path(ctx, allocation.x + 2, allocation.y + 2, allocation.width - 2,
                                        allocation.height - 2, 4);
                                ctx.set_source_rgb(242 / 256.0, 242 / 256.0, 242 / 256.0);
@@ -57,18 +90,18 @@ public class Avatar : Image {
                                
                                ctx.reset_clip();
                        }
+                       */
+                       draw_rounded_path(ctx, allocation.x, allocation.y, allocation.width,
+                               allocation.height, 4);
                        
-                       draw_rounded_path(ctx, allocation.x, allocation.y, allocation.width - 2,
-                               allocation.height - 2, 4);
-                       
-                       Gdk.cairo_set_source_pixbuf(ctx, pixbuf, allocation.x, allocation.y);
+                       Gdk.cairo_set_source_pixbuf(ctx, cpixbuf, allocation.x, allocation.y);
                        ctx.clip();
                        ctx.paint();
                }
                return false;
        }
        
-       private void draw_rounded_path(Context ctx, double x, double y,
+       public static void draw_rounded_path(Context ctx, double x, double y,
                double width, double height, double radius) {
                
                double degrees = M_PI / 180.0;
@@ -89,17 +122,8 @@ public class Avatar : Image {
                
                ctx.set_source_rgb(r, g, b);
        }
-       
-       private void redraw() {
-               if (null == this.window)
-                       return;
-
-               unowned Gdk.Region region = this.window.get_clip_region();
-               this.window.invalidate_region(region, true);
-               this.window.process_updates(true);
-    }
     
-    public void load_pic() {
+       public void load_pic() {
                try {
                        thread = Thread.create<void*>(load_pic_thread, true);
                } catch(GLib.Error e) {
@@ -115,6 +139,8 @@ public class Avatar : Image {
                        
                        Idle.add(() => {
                                thread.join();
+                               thread = null;
+                               
                                try {
                                        this.set_file_name(img_path);
                                } catch(GLib.Error e) {
index c84ce44..a116479 100644 (file)
@@ -3,11 +3,11 @@ using Cairo;
 
 
 /** Just for custom background */
-public class BgBox : HBox {
+public class BgBox : HBox, Redrawable {
        
        public bool fresh {get; set; default = false;}
        public bool favorited {get; set; default = false;}
-       private const double MAX_RGB = (double) uint16.MAX;
+       private double MAX_RGB = (double) uint16.MAX;
        
        //it's not actualy true colors, like in Gdk
        private Gdk.Color color_fresh;
@@ -58,13 +58,4 @@ public class BgBox : HBox {
                
                ctx.fill();
        }
-       
-       private void redraw() {
-               if (null == this.window)
-                       return;
-
-               unowned Gdk.Region region = this.window.get_clip_region ();
-               this.window.invalidate_region (region, true);
-               this.window.process_updates (true);
-    }
 }
index 3c599d0..d7e7a76 100644 (file)
@@ -3,7 +3,7 @@ using Gtk;
 public class CreateDialogGeneric : Gtk.Dialog {
        
        protected InfoBar pin_info;
-       protected Image acc_img;
+       protected Avatar acc_img;
        protected Label acc_name;
        
        protected Button ok_btn;
diff --git a/src/excluded/tree_widget.vala b/src/excluded/tree_widget.vala
new file mode 100644 (file)
index 0000000..ff79409
--- /dev/null
@@ -0,0 +1,337 @@
+using Gtk;
+using PinoEnums;
+
+public class TreeWidget : TreeView {
+       
+       public signal void cursor_moved(AStream stream);
+       
+       private Window parent;
+       private Accounts accounts;
+
+       private TreeStore store;
+       public TreePath current_tree_path;
+       
+       private Gdk.Pixbuf pix_account;
+       private Gdk.Pixbuf pix_updating;
+       
+       public Frame frame;
+       
+       public TreeWidget(Window parent, Accounts accounts) {
+               this.parent = parent;
+               this.accounts = accounts;
+               
+               try {
+                       pix_account = new Gdk.Pixbuf.from_file("/usr/share/icons/Humanity/places/24/folder-videos.svg");
+                       pix_updating = new Gdk.Pixbuf.from_file(Config.UPDATING_PATH);
+               } catch(GLib.Error e) {
+                       debug(e.message);
+               }
+               
+               accounts.insert_new_account.connect(new_account);
+               accounts.insert_new_stream_after.connect((after_path, stream) => {
+                       new_stream(after_path, stream, true);
+               });
+               accounts.element_was_removed.connect(remove_element);
+               
+               set_rules_hint(false);
+               set_headers_visible(false);
+               
+               frame = new Frame(null);
+               frame.add(this);
+               
+               setup();
+               
+               accounts.fresh_items_changed.connect((items, path) => {
+                       TreeIter iter;
+                       
+                       store.get_iter_from_string(out iter, path);
+                       store.set(iter, 2, items.to_string(), -1);
+               });
+               
+               accounts.account_was_changed.connect((path, account) => {
+                       TreeIter iter;
+                       store.get_iter_from_string(out iter, path);
+                       new_account_general(iter, account);
+               });
+               
+               accounts.stream_was_changed.connect((path, stream) => {
+                       debug("stream was changed");
+                       debug(path);
+                       TreeIter iter;
+                       store.get_iter_from_string(out iter, path);
+                       
+                       new_stream_general(iter, stream);
+               });
+               
+               button_release_event.connect(context_menu);
+       }
+
+       /** Building tree of accounts */
+       public void setup() {
+               //var icon_cell = new CellRendererPixbuf();
+               //icon_cell.stock_size = 24;
+               
+               insert_column_with_attributes(-1, "Icon", new IconWithStatusCellRrenderer(), "meta_row", 0, null);
+               //insert_column_with_attributes(-1, "Name", new CellRendererText(), "text", 1, null);
+               //insert_column_with_attributes(-1, "New messages", new UpdatesCellRrenderer(), "text", 2, null);
+       
+               store = new TreeStore(1, typeof(MetaRow));
+               set_model(store);
+
+               foreach(AAccount acc in accounts) {
+                       debug(acc.s_name);
+                       TreeIter iter;
+                       store.append(out iter, null);
+                       new_account_general(iter, acc);
+                       new_streams(acc, iter);
+               }
+
+               expand_all();
+
+               cursor_changed.connect(cursor_changed_callback);
+       }
+       
+       /** Set current item */
+       public void set_current(string path) {
+               if(path == "")
+                       return;
+               
+               TreePath tree_path = new TreePath.from_string(path);
+               set_cursor(tree_path, null, false);
+       }
+       
+       /** When current stream or account is changed */
+       private void cursor_changed_callback() {
+               debug("cursor was changed");
+               TreePath? path;
+               TreeViewColumn column;
+
+               get_cursor(out path, out column);
+               
+               if(path == null || path.to_string() == current_tree_path.to_string())
+                       return;
+               
+               current_tree_path = path;
+               
+               debug(path.to_string());
+
+               if(path.get_depth() == 2) { //stream
+                       int account_index = path.to_string().split(":")[0].to_int();
+                       int stream_index = path.to_string().split(":")[1].to_int();
+                       
+                       AAccount active_account = accounts.get(account_index);
+                       AStream active_stream = active_account.streams.get(stream_index);
+                       
+                       string hash = active_account.get_stream_hash(active_stream);
+
+                       cursor_moved(active_stream);
+               }
+       }
+
+       /** Get current account */
+       private AAccount? get_current_account() {
+               TreePath path;
+               TreeViewColumn column;
+
+               get_cursor(out path, out column);
+               string spath = path.to_string().split(":")[0];
+               
+               return accounts.get(spath.to_int());
+       }
+
+       /** Get current stream index */
+       private int? get_stream_index() {
+               TreePath path;
+               TreeViewColumn column;
+
+               get_cursor(out path, out column);
+               if(path.get_depth() < 2)
+                       return null;
+               
+               string spath = path.to_string().split(":")[1];
+               
+               return spath.to_int();
+       }
+       
+       /** Context menu for accounts and streams */
+       private bool context_menu(Gdk.EventButton event) {
+               if(event.button != 3)
+                       return false;
+               
+               debug("popup");
+               AAccount? account = get_current_account();
+               if(account == null)
+                       return false;
+               
+               int? stream_index = get_stream_index();
+               
+               if(stream_index == null) { //display account menu
+                       Menu menu = new Menu(); //main popup
+
+                       Menu streams_menu = new Menu(); //for streams
+                       
+                       foreach(StreamEnum stream in account.avaliable_streams().keys) {
+                               string label = streams_types.get(stream).name;
+                               ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
+                               Image img = streams_types.get(stream).get_menu_image();
+                               
+                               if(img != null)
+                                       menu_item.set_image(img);
+                               
+                               menu_item.activate.connect(() => { //add new stream to account
+                                       account.add_stream(stream, true);
+                               });
+                               streams_menu.append(menu_item);
+                       }
+                       
+                       MenuItem streams_item = new MenuItem.with_label("Add stream");
+                       streams_item.set_submenu(streams_menu);
+                       menu.append(streams_item);
+                       
+                       foreach(MenuItems item in account.popup_items) {
+                               MenuItems aitem = item;
+                               MenuItem? menu_item = item2menu(item);
+                               
+                               menu_item.activate.connect(() => {
+                                       accounts.actions_tracker(account, aitem, parent);
+                               });
+                               
+                               if(menu_item != null)
+                                       menu.append(menu_item);
+                               else
+                                       debug("item doesn't supported");
+                       }
+                       
+                       menu.show_all();
+                       menu.popup(null, null, null, 1, event.time);
+               } else { //display stream menu
+                       Menu menu = new Menu();
+                       
+                       foreach(MenuItems item in account.streams.get(stream_index).popup_items) {
+                               MenuItems sitem = item;
+                               debug("action: %d", sitem);
+                               ImageMenuItem menu_item = item2menu(sitem);
+                               
+                               menu_item.activate.connect(() => {
+                                       account.streams_actions_tracker(stream_index, sitem);
+                               });
+                               menu.append(menu_item);
+                       }
+                       
+                       menu.show_all();
+                       debug("%d", (int) event.time);
+                       menu.popup(null, null, null, 1, event.time);
+               }
+               return true;
+       }
+       
+       private ImageMenuItem item2menu(MenuItems item) {
+               string label = "";
+               
+               switch(item) {
+               case MenuItems.SETTINGS:
+                       label = _("Settings...");
+                       break;
+               
+               case MenuItems.REMOVE:
+                       label = _("Remove");
+                       break;
+               
+               case MenuItems.REFRESH:
+                       label = _("Refresh");
+                       break;
+               
+               case MenuItems.MORE:
+                       label = _("Get more");
+                       break;
+               }
+               
+               ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
+               
+               return menu_item;
+       }
+       
+       /** add new account to the tree */
+       private void new_account(AAccount account) {
+               TreeIter iter;
+               store.append(out iter, null);
+               
+               new_account_general(iter, account);
+               new_streams(account, iter);
+       }
+       
+       private void new_account_general(TreeIter iter, AAccount account) {
+               Gdk.Pixbuf? acc_icon = account.userpic;
+               if(acc_icon == null)
+                       acc_icon = pix_account;
+               
+               MetaRow meta_icon = new MetaRow(acc_icon,
+                       accounts_types.get(account.get_type()).icon,
+                       "%s (%s)".printf(account.s_name, accounts_types.get(account.get_type()).name),
+                       true);
+               store.set(iter, 0, meta_icon);
+       }
+       
+       private void new_streams(AAccount account, TreeIter iter) {
+               foreach(AStream stream in account.streams) {
+                       TreeIter iter_in;
+                       store.append(out iter_in, iter);
+                       
+                       new_stream_general(iter_in, stream);
+               }
+       }
+       
+       /** add new stream to the tree */
+       private void new_stream(string after_path, AStream stream, bool activate = false) {
+               TreeIter after_iter;
+               store.get_iter_from_string(out after_iter, after_path);
+
+               TreeIter iter;
+               store.append(out iter, after_iter);
+
+               new_stream_general(iter, stream);
+               
+               if(activate) {
+                       TreePath needed_path = store.get_path(iter);
+                       set_cursor(needed_path, null, false);
+               }
+       }
+       
+       /** Remove stream or account */
+       private void remove_element(string path, AAccount account, AStream? stream = null) {
+               TreeIter iter;
+               store.get_iter_from_string(out iter, path);
+               
+               if(!store.remove(iter))
+                       debug("element wasn't removed");
+       }
+       
+       private void new_stream_general(TreeIter iter, AStream stream) {
+               Gdk.Pixbuf stream_icon = streams_types.get(stream.stream_type).get_tree_pixbuf();
+               Gdk.Pixbuf? status_icon = null;
+               
+               switch(stream.status) {
+               case StreamStatus.UPDATING:
+                       status_icon = pix_updating;
+                       break;
+               }
+               
+               string stream_name;
+               
+               switch(stream.stream_type) {
+               case StreamEnum.SEARCH:
+                       stream_name = ((ISearch) stream).s_keyword;
+                       break;
+               case StreamEnum.GROUP:
+                       stream_name = "!" + ((Identica.StreamGroup) stream).s_group_name;
+                       break;
+               default:
+                       stream_name = streams_types.get(stream.stream_type).name;
+                       break;
+               }
+               
+               //MetaIcon meta_icon = new MetaIcon(stream_icon);
+               store.set(iter, 0, new MetaRow(stream_icon, status_icon, stream_name,
+                       false, stream.fresh_items));
+       }
+}
index 7ef18c3..f644e13 100644 (file)
@@ -13,6 +13,9 @@ public class FeedView : ScrolledWindow {
                vbox = new VBox(false, 2);
                add_with_viewport(vbox);
                
+               //remove border from viewport
+               ((Viewport) get_child()).set_shadow_type(ShadowType.NONE);
+               
                scroll = (VScrollbar) get_vscrollbar();
                scroll.value_changed.connect(() => {
                        //debug(scroll.get_value().to_string());
index 0e84e8f..2594843 100644 (file)
@@ -5,7 +5,7 @@ public class IconWithStatusCellRrenderer : CellRenderer {
        
        private const double TEXT_W_OFFSET = 6;
        private const double TEXT_H_OFFSET = 3;
-       private const double MAX_RGB = (double) uint16.MAX;
+       private double MAX_RGB = (double) uint16.MAX;
        private const int RADIUS = 5;
        private const double M_PI = 3.1415926535;
        
index 7eb443e..4c1fabd 100644 (file)
@@ -21,7 +21,7 @@ public class Account : Twitter.Account {
        }
        
        protected override void init_stream(AStream stream) {
-               if(stream.get_type() == typeof(Identica.StreamGroup)) { //init group stream
+               /*if(stream.get_type() == typeof(Identica.StreamGroup)) { //init group stream
                        if(((StreamGroup) stream).s_group_name == "") {
                                SearchDialog s_dialog = new SearchDialog();
                                if(s_dialog.run() == Gtk.ResponseType.OK) {
@@ -30,20 +30,20 @@ public class Account : Twitter.Account {
                                        ((Twitter.StreamAbstract) stream).set_proxy(proxy, s_name);
                                } else { //remove stream
                                        int index = streams.index_of(stream);
-                                       streams_actions_tracker(index, MenuItems.REMOVE);
+                                       streams_actions_tracker(stream, MenuItems.REMOVE);
                                        s_dialog.close();
                                        return;
                                }
                                return;
                        }
-               }
+               }*/
                
                base.init_stream(stream);
        }
        
        protected override HashMap<StreamEnum, GLib.Type> avaliable_streams() {
                HashMap<StreamEnum, GLib.Type> map = base.avaliable_streams();
-               map.set(StreamEnum.GROUP, typeof(Identica.StreamGroup));
+               //map.set(StreamEnum.GROUP, typeof(Identica.StreamGroup));
                return map;
        }
        
index 7aaa7e0..bfe6689 100644 (file)
@@ -43,7 +43,7 @@ public class CreateDialog : CreateDialogGeneric {
                check_btn.clicked.connect(verify_credentials);
                
                acc_info = new InfoBar();
-               acc_img = new Image();
+               acc_img = new Avatar(48);
                acc_name = new Label(null);
                
                acc_info.pack_start(acc_img, false, false, 0);
index 23bb2c7..831b59c 100644 (file)
@@ -1,27 +1,29 @@
-using Gee;
-using PinoEnums;
+/*
 
 namespace Identica {
-       
-public class StreamGroup : Twitter.StreamHome {
+
+public class StreamGroup : Twitter.StreamHome, ISearch {
 
        public override StreamEnum stream_type {get { return StreamEnum.GROUP; } }
        
-       protected override string func {get; set; default = "";}
+       protected override string func {get; set; default = "search.atom";}
        
        public override string id {get; set; default = "group";}
        
-       public string s_group_name {get; set; default = "";}
+       public string s_group_name {get; set; default= "";}
        
        construct {
-               debug("identica group stream was created");
+               debug("twitter search stream was created");
+               
+               parsing_delegate = Parser.get_search;
        }
        
        protected override void set_call_params(bool more = false) {
                base.set_call_params(more);
                
-               func = "statusnet/groups/timeline/" + s_group_name + ".xml";
-               call.set_function(func);
+               call.remove_param("q");
+               call.add_param("q", s_keyword);//GLib.Uri.escape_string(s_keyword, "", true));//Soup.form_encode("", s_keyword).split("=")[1]);
        }
 }
-}
+
+}*/
index 140aeec..9c3af26 100644 (file)
@@ -1,5 +1,5 @@
 using Gtk;
-using Rest;
+using RestCustom;
 using Cairo;
 
 public class TestWindow : Window {
@@ -71,6 +71,7 @@ public static int main (string[] args) {
        
        
        main_window = new MainWindow();
+       
        /*
        string api_key = "469089ec99372ee016bebd30218f1b23";
        string app_secret = "09c8836c79ba2f7182273bfb706c58c0";
@@ -94,3 +95,7 @@ public void some_case(string? path) {
        }
        debug(path);
 }
+
+public void request_token(OAuthProxy proxy, Error? error, GLib.Object? weak_object) {
+       
+}
index a6ee439..a6b06ab 100644 (file)
@@ -8,7 +8,8 @@ public class MainWindow : Window {
        //GUI
        private Widget menubar;
        public MenuIndicator indicator;
-       private TreeWidget tree;
+       //private TreeWidget tree;
+       AccountsWidget acc_widget;
        //private ContentView content_view;
        private ViewArea view_area;
        private StatusBox status_box;
@@ -17,10 +18,10 @@ public class MainWindow : Window {
        private HPaned hpaned;
        
        public MainWindow() {
-               set_size_request(550, 600);
+               set_size_request(380, 600);
                accounts = new Accounts();
                
-               tree = new TreeWidget(this, accounts);
+               //tree = new TreeWidget(this, accounts);
                
                menu_setup();
                
@@ -36,7 +37,7 @@ public class MainWindow : Window {
                ((MenuBar) menubar).append(indicator);
                
                var vbox = new VBox(false, 0);
-               vbox.pack_start(tree.frame, true, true, 0);
+               //vbox.pack_start(tree.frame, true, true, 0);
                
                var treebox = new HBox(false, 0);
                treebox.pack_start(vbox, true, true, 0);
@@ -63,6 +64,7 @@ public class MainWindow : Window {
                        settings.vpaned_position = vpaned.get_position();
                });
                
+               /*
                hpaned = new HPaned();
                hpaned.add1(treebox);
                hpaned.add2(vpaned);
@@ -70,10 +72,17 @@ public class MainWindow : Window {
                hpaned.notify["position"].connect((s) => {
                        settings.hpaned_position = hpaned.get_position();
                });
+               */
+               
+               acc_widget = new AccountsWidget(accounts);
+               
+               HBox hb_main = new HBox(false, 0);
+               hb_main.pack_start(acc_widget, false, false, 0);
+               hb_main.pack_start(vpaned, true, true, 0);
                
                VBox main_box = new VBox(false, 0);
                main_box.pack_start(menubar, false, false, 0);
-               main_box.pack_start(hpaned, true, true, 0);
+               main_box.pack_start(hb_main, true, true, 0);
                
                add(main_box);
                show_all();
@@ -84,24 +93,25 @@ public class MainWindow : Window {
                
                signals_setup();
                
-               tree.set_current(settings.current_item);
+               acc_widget.setup_current_stream();
+               //tree.set_current(settings.current_item);
        }
        
        private void menu_setup() {
-               ActionGroup act_group = new ActionGroup("main");
+               Gtk.ActionGroup act_group = new Gtk.ActionGroup("main");
                
-               Action file_menu = new Action("FileMenu", "Pino", null, null);
-               Action edit_menu = new Action("EditMenu", "Edit", null, null);
-               Action view_menu = new Action("ViewMenu", "View", null, null);
-               Action help_menu = new Action("HelpMenu", "Help", null, null);
+               Gtk.Action file_menu = new Gtk.Action("FileMenu", "Pino", null, null);
+               Gtk.Action edit_menu = new Gtk.Action("EditMenu", "Edit", null, null);
+               Gtk.Action view_menu = new Gtk.Action("ViewMenu", "View", null, null);
+               Gtk.Action help_menu = new Gtk.Action("HelpMenu", "Help", null, null);
                
-               Action create_account_act = new Action("CreateAccount", _("Add account"),
+               Gtk.Action create_account_act = new Gtk.Action("CreateAccount", _("Add account"),
                        _("Add account"), null);
                
                //setup all account types
                string accounts_string = "";
                foreach(Type t in accounts_types.keys) {
-                       Action acc_act = new Action(t.name(), accounts_types.get(t).name,
+                       Gtk.Action acc_act = new Gtk.Action(t.name(), accounts_types.get(t).name,
                                accounts_types.get(t).description, null);
                        
                        try {
@@ -161,15 +171,22 @@ public class MainWindow : Window {
                destroy.connect(() => {
                        accounts.sync();
                        
-                       settings.current_item = tree.current_tree_path.to_string();
+                       //settings.current_item = tree.current_tree_path.to_string();
                        
                        settings.sync();
                        main_quit();
                });
                
+               /*
                tree.cursor_moved.connect((stream) => {
                        //content_view.set_current_list(hash);
                        view_area.set_current_view(stream);
+               });*/
+               
+               /*
+               acc_widget.cursor_moved.connect((account, stream) => {
+                       view_area.set_current_view(account, stream);
                });
+               */
        }
 }
diff --git a/src/redrawable.vala b/src/redrawable.vala
new file mode 100644 (file)
index 0000000..5001afb
--- /dev/null
@@ -0,0 +1,12 @@
+/** Interface for widgets, which needs to be redrawn */
+public interface Redrawable : Gtk.Widget {
+       
+       protected void redraw() {
+               if (null == this.window)
+                       return;
+
+               unowned Gdk.Region region = this.window.get_clip_region ();
+               this.window.invalidate_region (region, true);
+               this.window.process_updates (true);
+       }
+}
\ No newline at end of file
index ca410fa..3ede154 100644 (file)
@@ -8,6 +8,7 @@ public class Settings : Object {
        public int hpaned_position {get; set; default = 150;}
        
        public string current_item {get; set; default = "";}
+       public int current_account{get; set; default = 0;}
        
        public ArrayList<string> selected_for_posting {get; set; default = new ArrayList<string>();}
        
index 8d664a9..bb1918c 100644 (file)
@@ -38,10 +38,7 @@ public class StatusChooseBar : Toolbar {
                        update_config();
                });
                
-               accounts.element_was_removed.connect((path, acc) => {
-                       if(path.contains(":")) //just stream, not account
-                       return;
-               
+               accounts.account_was_removed.connect((acc) => {
                        foreach(Widget tb in this.get_children()) {
                                if(tb.get_type() != typeof(ToggleToolButton))
                                        continue;
index f7d867e..d75b8b8 100644 (file)
@@ -24,9 +24,9 @@ public class StatusDelegate : EventBox {
        private SmartTimer timer;
        
        private Gdk.Pixbuf? rt_pixbuf = null;
-       private const double MAX_RGB = (double) uint16.MAX;
+       private double MAX_RGB = (double) uint16.MAX;
        
-       private string date_string = "<small><span foreground='#888'><b>%s</b></span></small>";
+       private string date_string = "<span foreground='#bbb'>%s</span>";
        
        private Regex nicks;
        private Regex tags;
@@ -331,22 +331,22 @@ public class StatusDelegate : EventBox {
                int delta = TimeParser.time_to_diff(created, is_search);
                
                if(delta < 30)
-                       return _("a few seconds ago");
+                       return _("%i secs").printf(delta);
                if(delta < 120) {
                        //timer.set_interval(120);
-                       return _("1 minute ago");
+                       return _("1 min");
                }
                if(delta < 3600) {
                        timer.set_interval(300);
-                       return _("%i minutes ago").printf(delta / 60);
+                       return _("%i mins").printf(delta / 60);
                }
                if(delta < 7200) {
                        timer.set_interval(3600);
-                       return _("about 1 hour ago");
+                       return _("1 hour");
                }
                if(delta < 86400) {
                        timer.set_interval(3600);
-                       return _("about %i hours ago").printf(delta / 3600);
+                       return _("%i hours").printf(delta / 3600);
                }
                
                timer.set_interval(0);
index 16d909d..7643205 100644 (file)
@@ -24,7 +24,7 @@ public abstract class AStream : Object {
        public abstract MenuItems[] popup_items {owned get;}
        
        /** Update interval in secs */
-       public virtual int s_update_interval {get; set; default = 5000;}
+       public virtual int s_update_interval {get; set; default = 60;}
        
        public int fresh_items {get; set; default = 0;}
        
index 2b0313d..0db732a 100644 (file)
@@ -7,7 +7,7 @@ public class StreamsTypes : HashMap<StreamEnum, StreamMeta> {
        public StreamsTypes() throws GLib.Error {
                Gtk.IconTheme theme = Gtk.IconTheme.get_default();
                
-               Gdk.Pixbuf home_icon = theme.load_icon("go-home", 24, 0);
+               Gdk.Pixbuf home_icon = theme.load_icon("go-home", 32, 0);
                StreamMeta home = new StreamMeta("Home", home_icon);
                set(StreamEnum.HOME, home);
 
@@ -15,15 +15,15 @@ public class StreamsTypes : HashMap<StreamEnum, StreamMeta> {
                StreamMeta mentions = new StreamMeta("Mentions", mentions_icon);
                set(StreamEnum.MENTIONS, mentions);
                
-               Gdk.Pixbuf public_icon = theme.load_icon("applications-internet", 24, 0);
+               Gdk.Pixbuf public_icon = theme.load_icon("applications-internet", 32, 0);
                StreamMeta public = new StreamMeta("Public", public_icon);
                set(StreamEnum.PUBLIC, public);
                
-               Gdk.Pixbuf favorites_icon = theme.load_icon("gtk-about", 24, 0);
+               Gdk.Pixbuf favorites_icon = theme.load_icon("gtk-about", 32, 0);
                StreamMeta favorites = new StreamMeta("Favorites", favorites_icon);
                set(StreamEnum.FAVORITES, favorites);
                
-               Gdk.Pixbuf search_icon = theme.load_icon("gtk-find", 24, 0);
+               Gdk.Pixbuf search_icon = theme.load_icon("gtk-find", 32, 0);
                StreamMeta search = new StreamMeta("Search", search_icon);
                set(StreamEnum.SEARCH, search);
                
diff --git a/src/tree_widget.vala b/src/tree_widget.vala
deleted file mode 100644 (file)
index ff79409..0000000
+++ /dev/null
@@ -1,337 +0,0 @@
-using Gtk;
-using PinoEnums;
-
-public class TreeWidget : TreeView {
-       
-       public signal void cursor_moved(AStream stream);
-       
-       private Window parent;
-       private Accounts accounts;
-
-       private TreeStore store;
-       public TreePath current_tree_path;
-       
-       private Gdk.Pixbuf pix_account;
-       private Gdk.Pixbuf pix_updating;
-       
-       public Frame frame;
-       
-       public TreeWidget(Window parent, Accounts accounts) {
-               this.parent = parent;
-               this.accounts = accounts;
-               
-               try {
-                       pix_account = new Gdk.Pixbuf.from_file("/usr/share/icons/Humanity/places/24/folder-videos.svg");
-                       pix_updating = new Gdk.Pixbuf.from_file(Config.UPDATING_PATH);
-               } catch(GLib.Error e) {
-                       debug(e.message);
-               }
-               
-               accounts.insert_new_account.connect(new_account);
-               accounts.insert_new_stream_after.connect((after_path, stream) => {
-                       new_stream(after_path, stream, true);
-               });
-               accounts.element_was_removed.connect(remove_element);
-               
-               set_rules_hint(false);
-               set_headers_visible(false);
-               
-               frame = new Frame(null);
-               frame.add(this);
-               
-               setup();
-               
-               accounts.fresh_items_changed.connect((items, path) => {
-                       TreeIter iter;
-                       
-                       store.get_iter_from_string(out iter, path);
-                       store.set(iter, 2, items.to_string(), -1);
-               });
-               
-               accounts.account_was_changed.connect((path, account) => {
-                       TreeIter iter;
-                       store.get_iter_from_string(out iter, path);
-                       new_account_general(iter, account);
-               });
-               
-               accounts.stream_was_changed.connect((path, stream) => {
-                       debug("stream was changed");
-                       debug(path);
-                       TreeIter iter;
-                       store.get_iter_from_string(out iter, path);
-                       
-                       new_stream_general(iter, stream);
-               });
-               
-               button_release_event.connect(context_menu);
-       }
-
-       /** Building tree of accounts */
-       public void setup() {
-               //var icon_cell = new CellRendererPixbuf();
-               //icon_cell.stock_size = 24;
-               
-               insert_column_with_attributes(-1, "Icon", new IconWithStatusCellRrenderer(), "meta_row", 0, null);
-               //insert_column_with_attributes(-1, "Name", new CellRendererText(), "text", 1, null);
-               //insert_column_with_attributes(-1, "New messages", new UpdatesCellRrenderer(), "text", 2, null);
-       
-               store = new TreeStore(1, typeof(MetaRow));
-               set_model(store);
-
-               foreach(AAccount acc in accounts) {
-                       debug(acc.s_name);
-                       TreeIter iter;
-                       store.append(out iter, null);
-                       new_account_general(iter, acc);
-                       new_streams(acc, iter);
-               }
-
-               expand_all();
-
-               cursor_changed.connect(cursor_changed_callback);
-       }
-       
-       /** Set current item */
-       public void set_current(string path) {
-               if(path == "")
-                       return;
-               
-               TreePath tree_path = new TreePath.from_string(path);
-               set_cursor(tree_path, null, false);
-       }
-       
-       /** When current stream or account is changed */
-       private void cursor_changed_callback() {
-               debug("cursor was changed");
-               TreePath? path;
-               TreeViewColumn column;
-
-               get_cursor(out path, out column);
-               
-               if(path == null || path.to_string() == current_tree_path.to_string())
-                       return;
-               
-               current_tree_path = path;
-               
-               debug(path.to_string());
-
-               if(path.get_depth() == 2) { //stream
-                       int account_index = path.to_string().split(":")[0].to_int();
-                       int stream_index = path.to_string().split(":")[1].to_int();
-                       
-                       AAccount active_account = accounts.get(account_index);
-                       AStream active_stream = active_account.streams.get(stream_index);
-                       
-                       string hash = active_account.get_stream_hash(active_stream);
-
-                       cursor_moved(active_stream);
-               }
-       }
-
-       /** Get current account */
-       private AAccount? get_current_account() {
-               TreePath path;
-               TreeViewColumn column;
-
-               get_cursor(out path, out column);
-               string spath = path.to_string().split(":")[0];
-               
-               return accounts.get(spath.to_int());
-       }
-
-       /** Get current stream index */
-       private int? get_stream_index() {
-               TreePath path;
-               TreeViewColumn column;
-
-               get_cursor(out path, out column);
-               if(path.get_depth() < 2)
-                       return null;
-               
-               string spath = path.to_string().split(":")[1];
-               
-               return spath.to_int();
-       }
-       
-       /** Context menu for accounts and streams */
-       private bool context_menu(Gdk.EventButton event) {
-               if(event.button != 3)
-                       return false;
-               
-               debug("popup");
-               AAccount? account = get_current_account();
-               if(account == null)
-                       return false;
-               
-               int? stream_index = get_stream_index();
-               
-               if(stream_index == null) { //display account menu
-                       Menu menu = new Menu(); //main popup
-
-                       Menu streams_menu = new Menu(); //for streams
-                       
-                       foreach(StreamEnum stream in account.avaliable_streams().keys) {
-                               string label = streams_types.get(stream).name;
-                               ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
-                               Image img = streams_types.get(stream).get_menu_image();
-                               
-                               if(img != null)
-                                       menu_item.set_image(img);
-                               
-                               menu_item.activate.connect(() => { //add new stream to account
-                                       account.add_stream(stream, true);
-                               });
-                               streams_menu.append(menu_item);
-                       }
-                       
-                       MenuItem streams_item = new MenuItem.with_label("Add stream");
-                       streams_item.set_submenu(streams_menu);
-                       menu.append(streams_item);
-                       
-                       foreach(MenuItems item in account.popup_items) {
-                               MenuItems aitem = item;
-                               MenuItem? menu_item = item2menu(item);
-                               
-                               menu_item.activate.connect(() => {
-                                       accounts.actions_tracker(account, aitem, parent);
-                               });
-                               
-                               if(menu_item != null)
-                                       menu.append(menu_item);
-                               else
-                                       debug("item doesn't supported");
-                       }
-                       
-                       menu.show_all();
-                       menu.popup(null, null, null, 1, event.time);
-               } else { //display stream menu
-                       Menu menu = new Menu();
-                       
-                       foreach(MenuItems item in account.streams.get(stream_index).popup_items) {
-                               MenuItems sitem = item;
-                               debug("action: %d", sitem);
-                               ImageMenuItem menu_item = item2menu(sitem);
-                               
-                               menu_item.activate.connect(() => {
-                                       account.streams_actions_tracker(stream_index, sitem);
-                               });
-                               menu.append(menu_item);
-                       }
-                       
-                       menu.show_all();
-                       debug("%d", (int) event.time);
-                       menu.popup(null, null, null, 1, event.time);
-               }
-               return true;
-       }
-       
-       private ImageMenuItem item2menu(MenuItems item) {
-               string label = "";
-               
-               switch(item) {
-               case MenuItems.SETTINGS:
-                       label = _("Settings...");
-                       break;
-               
-               case MenuItems.REMOVE:
-                       label = _("Remove");
-                       break;
-               
-               case MenuItems.REFRESH:
-                       label = _("Refresh");
-                       break;
-               
-               case MenuItems.MORE:
-                       label = _("Get more");
-                       break;
-               }
-               
-               ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
-               
-               return menu_item;
-       }
-       
-       /** add new account to the tree */
-       private void new_account(AAccount account) {
-               TreeIter iter;
-               store.append(out iter, null);
-               
-               new_account_general(iter, account);
-               new_streams(account, iter);
-       }
-       
-       private void new_account_general(TreeIter iter, AAccount account) {
-               Gdk.Pixbuf? acc_icon = account.userpic;
-               if(acc_icon == null)
-                       acc_icon = pix_account;
-               
-               MetaRow meta_icon = new MetaRow(acc_icon,
-                       accounts_types.get(account.get_type()).icon,
-                       "%s (%s)".printf(account.s_name, accounts_types.get(account.get_type()).name),
-                       true);
-               store.set(iter, 0, meta_icon);
-       }
-       
-       private void new_streams(AAccount account, TreeIter iter) {
-               foreach(AStream stream in account.streams) {
-                       TreeIter iter_in;
-                       store.append(out iter_in, iter);
-                       
-                       new_stream_general(iter_in, stream);
-               }
-       }
-       
-       /** add new stream to the tree */
-       private void new_stream(string after_path, AStream stream, bool activate = false) {
-               TreeIter after_iter;
-               store.get_iter_from_string(out after_iter, after_path);
-
-               TreeIter iter;
-               store.append(out iter, after_iter);
-
-               new_stream_general(iter, stream);
-               
-               if(activate) {
-                       TreePath needed_path = store.get_path(iter);
-                       set_cursor(needed_path, null, false);
-               }
-       }
-       
-       /** Remove stream or account */
-       private void remove_element(string path, AAccount account, AStream? stream = null) {
-               TreeIter iter;
-               store.get_iter_from_string(out iter, path);
-               
-               if(!store.remove(iter))
-                       debug("element wasn't removed");
-       }
-       
-       private void new_stream_general(TreeIter iter, AStream stream) {
-               Gdk.Pixbuf stream_icon = streams_types.get(stream.stream_type).get_tree_pixbuf();
-               Gdk.Pixbuf? status_icon = null;
-               
-               switch(stream.status) {
-               case StreamStatus.UPDATING:
-                       status_icon = pix_updating;
-                       break;
-               }
-               
-               string stream_name;
-               
-               switch(stream.stream_type) {
-               case StreamEnum.SEARCH:
-                       stream_name = ((ISearch) stream).s_keyword;
-                       break;
-               case StreamEnum.GROUP:
-                       stream_name = "!" + ((Identica.StreamGroup) stream).s_group_name;
-                       break;
-               default:
-                       stream_name = streams_types.get(stream.stream_type).name;
-                       break;
-               }
-               
-               //MetaIcon meta_icon = new MetaIcon(stream_icon);
-               store.set(iter, 0, new MetaRow(stream_icon, status_icon, stream_name,
-                       false, stream.fresh_items));
-       }
-}
index 3bc24ac..d733cb5 100644 (file)
@@ -1,6 +1,6 @@
 using Gee;
 using PinoEnums;
-using RestCustom;
+using Rest;
 
 namespace Twitter {
 
@@ -70,27 +70,28 @@ public class Account : AAccount {
        protected override void init_stream(AStream stream) {
                debug("init stream");
                
-               if(s_token != "") {
-                       if(stream.get_type().name() == "TwitterStreamSearch") { //setup searches
-                               if(((StreamSearch) stream).s_keyword == "") {
-                                       SearchDialog s_dialog = new SearchDialog();
-                                       if(s_dialog.run() == Gtk.ResponseType.OK) {
-                                               ((StreamSearch) stream).s_keyword = s_dialog.input.get_text();
-                                               s_dialog.close();
-                                       } else { //remove stream
-                                               int index = streams.index_of(stream);
-                                               streams_actions_tracker(index, MenuItems.REMOVE);
-                                               s_dialog.close();
-                                               return;
-                                       }
+               //if(s_token != "") {
+               if(stream.get_type() == typeof(Twitter.StreamSearch)) { //setup searches
+                       if(((StreamSearch) stream).s_keyword == "") {
+                               SearchDialog s_dialog = new SearchDialog();
+                               if(s_dialog.run() == Gtk.ResponseType.OK) {
+                                       ((StreamSearch) stream).s_keyword = s_dialog.input.get_text();
+                                       s_dialog.close();
+                               } else { //remove stream
+                                       int index = streams.index_of(stream);
+                                       streams_actions_tracker(stream, MenuItems.REMOVE);
+                                       s_dialog.close();
+                                       return;
                                }
-                               
-                               Rest.Proxy search_proxy = new Rest.Proxy(search_url, false);
-                               ((Twitter.StreamAbstract) stream).set_proxy(search_proxy, s_name);
-                       } else {
-                               ((Twitter.StreamAbstract) stream).set_proxy(proxy, s_name);
                        }
+                       
+                       Rest.Proxy search_proxy = new Rest.Proxy(search_url, false);
+                       ((Twitter.StreamAbstract) stream).set_proxy(search_proxy, s_name);
+                       return;
                }
+               
+               ((Twitter.StreamAbstract) stream).set_proxy(proxy, s_name);
+               //}
        }
        
        public override void post_install() {
@@ -246,7 +247,7 @@ public class Account : AAccount {
        
        protected void load_userpic_thread() {
                try {
-                       unowned Thread thread = Thread.create(load_userpic, true);
+                       unowned Thread<void*> thread = Thread.create<void*>(load_userpic, true);
                } catch(GLib.Error e) {
                        debug(e.message); //TODO
                }
index ca7644c..60c57fd 100644 (file)
@@ -12,11 +12,12 @@ public class CreateDialog : CreateDialogGeneric {
        private Button access_btn;
        private InfoBar acc_info;
        
-       private weak Thread? request_token_thread = null;
-       private bool must_close = false;
        private OAuthProxy proxy;
        
        private string root_url {get; set; default = "";}
+       private string consumer_key {get; set; default = "";}
+       private string consumer_secret {get; set; default = "";}
+       
        public string s_token;
        public string s_token_secret;
        public string s_name;
@@ -27,9 +28,9 @@ public class CreateDialog : CreateDialogGeneric {
                
                base(parent, _("Link with %s account").printf(service_name), icon_name);
                
-               debug(this.root_url);
                this.root_url = root_url;
-               debug("ok");
+               this.consumer_key = consumer_key;
+               this.consumer_secret = consumer_secret;
                
                this.proxy = new OAuthProxy(consumer_key, consumer_secret,
                        root_url, false);
@@ -63,7 +64,7 @@ public class CreateDialog : CreateDialogGeneric {
                access_btn.clicked.connect(access_token_action);
                
                acc_info = new InfoBar();
-               acc_img = new Image();
+               acc_img = new Avatar(48);
                acc_name = new Label(null);
                //acc_name.wrap_mode = Pango.WrapMode.WORD;
                //acc_name.set_ellipsize(Pango.EllipsizeMode.END);
@@ -90,8 +91,7 @@ public class CreateDialog : CreateDialogGeneric {
                acc_info.hide();
                
                destroy.connect(() => {
-                       must_close = true;
-                       proxy.dispose();
+                       this.proxy.dispose();
                });
        }
        
@@ -100,160 +100,108 @@ public class CreateDialog : CreateDialogGeneric {
                tprogress.show();
                tprogress.start();
                
-               try {
-                       request_token_thread = Thread.create(request_token, true);
-                       //jo = request_token_thread.join();
-               } catch(ThreadError e) {
-                       debug(e.message);
-               }
+               OAuthProxyAuthCallback request_token_callback = request_token;
+               
+               OAuthProxy.request_token_async(proxy, "oauth/request_token", "oob",
+                       request_token_callback, this);
        }
        
        private void access_token_action() {
                access_btn.set_sensitive(false);
                pin.set_sensitive(false);
                
-               try {
-                       request_token_thread = Thread.create(access_token, true);
-               } catch(ThreadError e) {
-                       debug(e.message);
-               }
+               OAuthProxyAuthCallback access_token_callback = access_token;
+               
+               OAuthProxy.access_token_async(proxy, "oauth/access_token", pin.text,
+                       access_token_callback, this);
        }
        
-       private void* request_token() {
-               bool answer = false;
-               try {
-                       answer = OAuthProxy.request_token(proxy, "oauth/request_token", "oob");
-               } catch (GLib.Error e) {
-                       debug(e.message); //TODO
+       public void request_token(OAuthProxy proxy, Error? error, GLib.Object? obj) {
+               if(error != null) {
+                       extra_exit();
+                       return;
                }
                
-               if(!answer) {
-                       debug("request token is failed");
-                       
-                       if(must_close)
-                               return null;
-                       
-                       auth_btn.set_sensitive(true);
-                       tprogress.hide();
-                       return null;
+               string token = OAuthProxy.get_token(this.proxy);
+               debug(token);
+
+               //open link in a browser
+               GLib.Pid pid;
+               string command = root_url + "oauth/authorize?oauth_token=" + token;
+               try {
+                       GLib.Process.spawn_async(".", {"/usr/bin/xdg-open", command}, null,
+                               GLib.SpawnFlags.STDOUT_TO_DEV_NULL, null, out pid);
+                       debug("ok");
+               } catch(GLib.SpawnError e) {
+                       debug(e.message); //TODO
                }
                
-               if(must_close)
-                       return null;
-               
-               Idle.add(() => {
-                       string token = OAuthProxy.get_token(proxy);
-                       token_received(token);
-                       return false;
-               });
+               tprogress.hide();
+               pin_info.show();
+               a_box.show();
                
-               return null;
+               set_focus(pin);
        }
        
-       private void* access_token() {
-               bool answer = false;
-               
-               try {
-                       answer = OAuthProxy.access_token(proxy, "oauth/access_token", pin.text);
-               } catch(GLib.Error e) {
-                       debug(e.message); //TODO
+       private void access_token(OAuthProxy proxy, Error? error, GLib.Object? obj) {
+               if(error != null) {
+                       extra_exit();
+                       return;
                }
                
-               if(!answer) {
-                       debug("access token is failed");
-                       
-                       return if_error();
-               }
+               debug(OAuthProxy.get_token_secret(proxy));
                
-               if(must_close)
-                       return null;
-               
-               //fetching credentioals
                Rest.ProxyCall call = proxy.new_call();
                call.set_function("account/verify_credentials.xml");
                call.set_method("GET");
                
-               try {
-                       answer = call.sync();
-               } catch(GLib.Error e) {
-                       debug(e.message); //TODO
-                       
-                       return if_error();
-               }
+               Rest.ProxyCallAsyncCallback gc_callback = get_credentials;
+               call.run_async(get_credentials, this);
+               
+               return;
+       }
+       
+       private void get_credentials(Rest.ProxyCall call, Error? error,
+               GLib.Object? obj) {
                
-               if(!answer) {
-                       debug("access token is failed");
-                       
-                       return if_error();
+               if(error != null) {
+                       extra_exit();
+                       return;
                }
                
                debug(call.get_payload());
                
-               Rest.XmlParser parser = new Rest.XmlParser();
-               Rest.XmlNode root = parser.parse_from_data(call.get_payload(),
-                       (int64) call.get_payload().size());
-               
-               foreach(var val in root.children.get_values()) {
-                       Rest.XmlNode node = (Rest.XmlNode) val;
-                       if(node.name == "profile_image_url") {
-                               this.s_avatar_url = node.content;
-                               string? acc_img_path = img_cache.download(node.content);
-                               if(acc_img_path != null)
-                                       acc_img.set_from_file(acc_img_path);
-                       }
-                       
-                       if(node.name == "screen_name") {
-                               this.s_name = node.content;
-                               acc_name.set_markup(_("Hello, <b>%s</b>!\nPress 'OK' to add this account".printf(node.content)));
-                       }
+               User? user = Twitter.Parser.get_single_user(call.get_payload());
+               
+               if(user == null) {
+                       extra_exit(_("Error when parsed credentials"));
+                       return;
                }
                
-               if(must_close)
-                       return null;
+               this.s_avatar_url = user.pic;
+               acc_img.set_from_url(user.pic);
+               this.s_name = user.name;
+               acc_name.set_markup(_("Hello, <b>%s</b>!\nPress <b>OK</b> to add this account".printf(user.name)));
                
                acc_info.show();
                
-               Idle.add(() => {
-                       this.s_token = OAuthProxy.get_token(proxy);
-                       this.s_token_secret = OAuthProxy.get_token_secret(proxy);
-                       
-                       ok_btn.set_sensitive(true);
-                       
-                       return false;
-               });
-                               
-               return null;
+               this.s_token = OAuthProxy.get_token(proxy);
+               this.s_token_secret = OAuthProxy.get_token_secret(proxy);
+               
+               ok_btn.set_sensitive(true);
        }
        
-       /* When we got a token */
-       private void token_received(string token) {
-               debug(token);
-               
-               //open link in a browser
-               GLib.Pid pid;
+       void extra_exit(string msg =
+               _("Something went wrong. You can't complete authorization.")) {
                
-               try {
-                       GLib.Process.spawn_async(".", {"/usr/bin/xdg-open",
-                               root_url + "oauth/authorize?oauth_token=" + token}, null,
-                               GLib.SpawnFlags.STDOUT_TO_DEV_NULL, null, out pid);
-               } catch(GLib.SpawnError e) {
-                       debug(e.message); //TODO
-               }
+               MessageDialog dlg = new Gtk.MessageDialog(this, Gtk.DialogFlags.MODAL,
+                       Gtk.MessageType.ERROR, Gtk.ButtonsType.OK,
+                       msg);
                
-               tprogress.hide();
-               pin_info.show();
-               a_box.show();
-               
-               set_focus(pin);
-       }
-       
-       private void* if_error() {
-               if(must_close)
-                       return null;
+               dlg.run();
+               dlg.close();
                
-               access_btn.set_sensitive(true);
-               pin.set_sensitive(true);
-               return null;
+               response(ResponseType.CANCEL);
        }
 }
 
index 6ba3f09..38843e3 100644 (file)
@@ -1,4 +1,4 @@
-using RestCustom;
+using Rest;
 using Gee;
 
 namespace Twitter {
index 0b53c96..0614f07 100644 (file)
@@ -20,6 +20,11 @@ public abstract class StreamAbstract : AStream {
        protected abstract void parse_stream(string data);
        protected abstract void parse_more_stream(string data);
        
+       construct {
+               SmartTimer timer = new SmartTimer(s_update_interval);
+               timer.timeout.connect(menu_refresh);
+       }
+
        public virtual void set_proxy(Rest.Proxy proxy, string own_name, string password = "") {
                this.proxy = proxy;
                this.own_name = own_name;
index 0d90060..eae638a 100644 (file)
@@ -7,7 +7,7 @@ public class UpdatesCellRrenderer : CellRenderer {
        
        private const int RADIUS = 5;
        private const double M_PI = 3.1415926535;
-       private const double MAX_RGB = (double) uint16.MAX;
+       private double MAX_RGB = (double) uint16.MAX;
        private const double TEXT_W_OFFSET = 6;
        private const double TEXT_H_OFFSET = 3;
        
index 7c0f93c..a514c04 100644 (file)
@@ -113,9 +113,12 @@ namespace RestCustom {
                [CCode (cname = "oauth_proxy_new", type = "RestProxy*", has_construct_function = false)]
                public OAuthProxy (string consumer_key, string consumer_secret, string url_format, bool binding_required);
 
+               [CCode (cname = "oauth_proxy_request_token_async")]
+               public static bool request_token_async (OAuthProxy proxy, string function, string callback_uri, [CCode (delegate_target_pos = 4.9)] OAuthProxyAuthCallback callback, GLib.Object? weak_object) throws GLib.Error;
                [CCode (cname = "oauth_proxy_request_token")]
-               public static bool request_token (OAuthProxy proxy, string url_format, string oob) throws GLib.Error;
-
+               public static bool request_token (OAuthProxy proxy, string function, string callback_uri) throws GLib.Error;
+               [CCode (cname = "oauth_proxy_access_token_async")]
+               public static bool access_token_async (OAuthProxy proxy, string function, string callback_uri, [CCode (delegate_target_pos = 4.9)] OAuthProxyAuthCallback callback, GLib.Object? weak_object) throws GLib.Error;
                [CCode (cname = "oauth_proxy_access_token")]
                public static bool access_token (OAuthProxy proxy, string url_format, string oob) throws GLib.Error;
                
@@ -140,4 +143,7 @@ namespace RestCustom {
                public string token { get; set; }
                public string token_secret { get; set; }
        }
+       
+       [CCode (cheader_filename = "rest/oauth-proxy.h")]
+       public delegate void OAuthProxyAuthCallback (OAuthProxy proxy, GLib.Error? error, GLib.Object? weak_object);
 }
index 642be58..873ef00 100644 (file)
@@ -5,7 +5,7 @@ public class ViewArea : VBox {
        
        private Accounts accounts;
        private HashMap<AStream, FeedView> map;
-       private AStream current_stream;
+       //private AStream current_stream;
        
        public ViewArea(Accounts accounts) {
                this.accounts = accounts;
@@ -15,52 +15,57 @@ public class ViewArea : VBox {
                homogeneous = true;
                spacing = 0;
                
-               accounts.insert_new_stream_after.connect((path, stream) => {
-                       FeedView view = create_feed_view(stream);
-                       view.show_all();
-                       set_current_view(stream);
-               });
-               
-               accounts.element_was_removed.connect((path, account, stream) => {
-                       //if account
-                       if(stream == null) {
-                               foreach(AStream st in account.streams) {
-                                       remove_feed_view(st);
-                                       debug("streams removed");
-                               }
-                       } else { //if stream
-                               remove_feed_view(stream);
-                       }
-               });
-               
-               accounts.insert_new_account.connect((account) => {
-                       foreach(AStream stream in account.streams) {
-                               create_feed_view(stream);
+               accounts.account_was_removed.connect((account) => {
+                       foreach(AStream st in account.streams) {
+                               remove_feed_view(st);
+                               debug("streams removed");
                        }
                });
                
-               //generate_views();
-               //show_all();
+               accounts.insert_new_account.connect(account_setup);
        }
        
        public void generate_views() {
                foreach(AAccount account in accounts) {
-                       foreach(AStream stream in account.streams) {
-                               create_feed_view(stream);
-                       }
+                       account_setup(account);
                }
        }
        
+       private void account_setup(AAccount? account) {
+               if(account == null)
+                       return;
+               
+               foreach(AStream stream in account.streams) {
+                       create_feed_view(stream);
+               }
+               
+               account.streams.removed.connect(remove_feed_view);
+               
+               account.streams.cursor_changed.connect((new_stream, old_stream) => {
+                       if(new_stream == null)
+                               return; //TODO
+                       
+                       set_current_view(new_stream.account, new_stream, old_stream);
+               });
+                       
+               account.streams.added.connect((stream) => {
+                       FeedView view = create_feed_view(stream);
+                       view.show_all();
+                       //set_current_view(stream.account, stream);
+               });
+       }
+       
        private void remove_feed_view(AStream stream) {
                FeedView view = map[stream];
                remove(view);
                map.remove(stream);
-               
-               if(stream == current_stream)
-                       current_stream.dispose();
+               view.dispose();
+               //if(stream == current_stream)
+               //      current_stream.dispose();
        }
        
        private FeedView create_feed_view(AStream stream) {
+               debug("create feed view");
                FeedView view = new FeedView();
                
                view.set_model(stream.model);
@@ -73,15 +78,28 @@ public class ViewArea : VBox {
                return view;
        }
        
-       public void set_current_view(AStream stream) {
-               if(stream == current_stream)
-                       return;
+       public void set_current_view(AAccount? account, AStream? stream,
+               AStream? old_stream) {
+               debug("set_current_view");
+               //if(stream == current_stream)
+               //      return;
+               
+               if(stream == null) {
+                       return;/*
+                       if(account.streams.size < 1)
+                               return;
+                       
+                       stream = account.streams.get(0);*/
+               }
                
-               map[current_stream].hide();
-               current_stream = stream;
+               if(old_stream != null)
+                       map[old_stream].hide();
                
+               //current_stream = stream;
                
-               FeedView view = map[stream];
-               view.show_all();
+               
+               map[stream].show_all();
+               //view.show_all();
+               debug("set_current_view");
        }
 }
index 73e8b3c..c33dbdf 100644 (file)
@@ -29,7 +29,7 @@ public class VisualStyle : GLib.Object {
                
                Value? v = new Value(typeof(Gdk.Color));
                if(v != null) {
-                       style.get_style_property(typeof(Gtk.Widget), "link-color", v);
+                       style.get_style_property(typeof(Gtk.Widget), "link-color", out v);
                        lk_color = rgb_to_hex((Gdk.Color) v);
                        debug(lk_color);
                }
diff --git a/src/wscript b/src/wscript
deleted file mode 100644 (file)
index 754f3ae..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-
-def build(bld):
-       prog = bld.new_task_gen(
-               'cc', 'program',
-               name = 'pino',
-               target = 'pino',
-               uselib = 'GTK+ GOBJECT LIBXML GEE LIBNOTIFY LIBSOUP WEBKIT GTHREAD LIBUNIQUE GTKSPELL REST',
-               packages = 'gtk+-2.0 gee-1.0 gio-2.0 libnotify libsoup-2.4 libxml-2.0 webkit-1.0 rest config unique-1.0',
-               ccflags = ['-include', 'config.h', '-DYAML_DECLARE_STATIC'],
-               vapi_dirs = 'vapi/',
-               source = bld.path.ant_glob(incl = 'vapi/*.c *.vala'),
-               threading = True
-       )
-       prog.install_path = '${PREFIX}/bin'
-       prog.includes = 'vapi/'
-       prog.includes = 'twitter/'