finalising version 0.1!

.gitignore

@@ -0,0 +1,19 @@
+# Binaries and object files
+gnome-vault
+*.o
+
+# Logs
+*.log
+GnomeSettingsVault.log
+
+# Backups and Vaults
+*.gbk
+*vault_new/
+*vault_old/
+/tmp/gvault_*
+
+# IDE/Editor specific
+.vscode/
+.idea/
+*~
+*.swp

LICENSE

@@ -0,0 +1,624 @@
+GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://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 those problems are 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 Component, but which is not part of that Component, and
+(b) serves only to enable use of the work with that Component, or to
+implement a Standard Interface for which an implementation is
+available to the public in source code form.  A "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 the
+    Corresponding Source is located.  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 propagation 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 propagation.
+
+  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 the 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 licensing 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 a term that
+obligates 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 offers the most absolute
+waiver of 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

MainWindow.cpp

@@ -1,3 +1,14 @@
+/*
+ * GnomeSettingsVault - A GNOME configuration backup utility.
+ * Copyright (C) 2026 Nicole Portas, nicole@equalmass.com
+ *
+ * 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.
+ */
+
+
 #include "MainWindow.hpp"
 #include <iostream>
 #include <filesystem>
@@ -11,51 +22,30 @@
 #include <chrono>
 #include <iomanip>
 #include <sstream>
+#include <set>
 
 namespace fs = std::filesystem;
 
-// The initialization list now perfectly matches the header declaration order
 MainWindow::MainWindow()
-: m_HeaderBar(),
-  m_MainLayout(Gtk::ORIENTATION_VERTICAL, 0),
-  m_Notebook(),
-  m_ScrolledWindow(),
-  m_LogView(),
-  m_RefTextBuffer(),
-  m_StatusLabel("Ready."),
-  m_VBoxBackup(Gtk::ORIENTATION_VERTICAL, 10),
-  m_LabelBackupInstruction("<span size='large' weight='bold'>Select what to backup:</span>"),
-  m_CheckThemesBackup("GTK Themes (~/.themes)"),
-  m_CheckIconsBackup("Icons (~/.icons)"),
-  m_CheckWallpapersBackup("Wallpapers (Dynamic)"),
-  m_CheckExtensionsBackup("GNOME Extensions"),
-  m_CheckDconfBackup("GNOME Settings (dconf)"),
-  m_ButtonBackup("Start Backup"),
+: m_HeaderBar(), m_MainLayout(Gtk::ORIENTATION_VERTICAL, 0), m_Notebook(),
+  m_BottomBox(Gtk::ORIENTATION_HORIZONTAL, 10), m_StatusLabel("Ready."), 
+  m_CheckDebugMode("Enable Debug Logging"), m_VBoxBackup(Gtk::ORIENTATION_VERTICAL, 10),
+  m_LabelBackupInstruction("<span size='large' weight='bold'>Backup</span>"),
+  m_CheckThemesBackup("GTK Themes"), m_CheckIconsBackup("Icons"),
+  m_CheckWallpapersBackup("Wallpapers"), m_CheckExtensionsBackup("GNOME Extensions"),
+  m_CheckDconfBackup("GNOME Settings"), m_ButtonBackup("Start Backup"),
   m_VBoxRestore(Gtk::ORIENTATION_VERTICAL, 10),
-  m_LabelRestoreInstruction("<span size='large' weight='bold'>Select what to restore:</span>"),
-  m_CheckThemesRestore("GTK Themes"),
-  m_CheckIconsRestore("Icons"),
-  m_CheckWallpapersRestore("Wallpapers"),
-  m_CheckExtensionsRestore("GNOME Extensions"),
-  m_CheckDconfRestore("GNOME Settings"),
-  m_CheckDryRunRestore("Dry Run (Simulate only, do not write files)"),
-  m_ButtonRestore("Start Restore"),
-  m_WorkerRunning(false)
+  m_LabelRestoreInstruction("<span size='large' weight='bold'>Restore from Vault</span>"),
+  m_ButtonSelectVault("Select .gbk Vault File"), m_LabelSelectedVault("No vault selected"),
+  m_CheckThemesRestore("GTK Themes"), m_CheckIconsRestore("Icons"),
+  m_CheckWallpapersRestore("Wallpapers"), m_CheckExtensionsRestore("GNOME Extensions"),
+  m_CheckDconfRestore("GNOME Settings"), m_CheckDryRunRestore("Dry Run"),
+  m_ButtonRestore("Start Restore"), m_WorkerRunning(false), m_JobSuccess(true), 
+  m_IsDebugMode(false), m_LastJobWasRestore(false)
 {
-    // Connect the inter-thread dispatcher
     m_Dispatcher.connect(sigc::mem_fun(*this, &MainWindow::on_dispatcher_ping));
-
-    const char* home = std::getenv("HOME");
-    if (home) {
-        std::string log_path = std::string(home) + "/gnome-vault.log";
-        m_LogFile.open(log_path, std::ios::app);
-    }
-
-    set_default_size(650, 700);
-    set_border_width(0);
-
-    m_HeaderBar.set_title("Gnome-Vault");
-    m_HeaderBar.set_subtitle("System State Manager");
+    set_default_size(1000, 700);
+    m_HeaderBar.set_title("GnomeSettingsVault 0.1");
     m_HeaderBar.set_show_close_button(true);
     set_titlebar(m_HeaderBar);
 
@@ -63,106 +53,139 @@ MainWindow::MainWindow()
     m_LabelRestoreInstruction.set_use_markup(true);
 
     m_RefTextBuffer = Gtk::TextBuffer::create();
+    auto selection_tag = m_RefTextBuffer->create_tag("selection_orange");
+    selection_tag->property_background() = "#ff8c00";
+    selection_tag->property_foreground() = "#000000";
+    
     m_LogView.set_buffer(m_RefTextBuffer);
     m_LogView.set_editable(false);
-    m_LogView.set_cursor_visible(false);
-    m_LogView.set_wrap_mode(Gtk::WRAP_WORD);
+    m_LogView.set_cursor_visible(true);
+    m_LogView.set_can_focus(true);
+    
+    m_RefTextBuffer->signal_mark_set().connect([this, selection_tag](const Gtk::TextBuffer::iterator& iter, const Glib::RefPtr<Gtk::TextMark>& mark){
+        Gtk::TextBuffer::iterator start, end;
+        if (m_RefTextBuffer->get_selection_bounds(start, end)) {
+            m_RefTextBuffer->apply_tag(selection_tag, start, end);
+        } else {
+            m_RefTextBuffer->remove_tag(selection_tag, m_RefTextBuffer->begin(), m_RefTextBuffer->end());
+        }
+    });
+
     m_LogView.override_background_color(Gdk::RGBA("#1e1e1e")); 
     m_LogView.override_color(Gdk::RGBA("#dcdcdc"));
     
-    m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-    m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_IN);
+    m_RefTextBuffer->create_mark("last_line", m_RefTextBuffer->end());
     m_ScrolledWindow.add(m_LogView);
-    m_ScrolledWindow.set_size_request(-1, 250);
-    m_ScrolledWindow.set_margin_left(10);
-    m_ScrolledWindow.set_margin_right(10);
+    m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
 
-    m_VBoxBackup.set_border_width(15);
+    m_VBoxBackup.set_border_width(20);
     m_VBoxBackup.pack_start(m_LabelBackupInstruction, Gtk::PACK_SHRINK);
     m_VBoxBackup.pack_start(m_CheckThemesBackup, Gtk::PACK_SHRINK);
     m_VBoxBackup.pack_start(m_CheckIconsBackup, Gtk::PACK_SHRINK);
     m_VBoxBackup.pack_start(m_CheckWallpapersBackup, Gtk::PACK_SHRINK);
     m_VBoxBackup.pack_start(m_CheckExtensionsBackup, Gtk::PACK_SHRINK);
     m_VBoxBackup.pack_start(m_CheckDconfBackup, Gtk::PACK_SHRINK);
-    
-    m_CheckThemesBackup.set_active(true);
-    m_CheckIconsBackup.set_active(true);
-    m_CheckWallpapersBackup.set_active(true);
-    m_CheckExtensionsBackup.set_active(true);
-    m_CheckDconfBackup.set_active(true);
-    
-    m_ButtonBackup.set_size_request(-1, 45);
     m_VBoxBackup.pack_end(m_ButtonBackup, Gtk::PACK_SHRINK);
-
-    m_VBoxRestore.set_border_width(15);
+    
+    m_VBoxRestore.set_border_width(20);
     m_VBoxRestore.pack_start(m_LabelRestoreInstruction, Gtk::PACK_SHRINK);
+    m_VBoxRestore.pack_start(m_ButtonSelectVault, Gtk::PACK_SHRINK);
+    m_VBoxRestore.pack_start(m_LabelSelectedVault, Gtk::PACK_SHRINK);
     m_VBoxRestore.pack_start(m_CheckThemesRestore, Gtk::PACK_SHRINK);
     m_VBoxRestore.pack_start(m_CheckIconsRestore, Gtk::PACK_SHRINK);
     m_VBoxRestore.pack_start(m_CheckWallpapersRestore, Gtk::PACK_SHRINK);
     m_VBoxRestore.pack_start(m_CheckExtensionsRestore, Gtk::PACK_SHRINK);
     m_VBoxRestore.pack_start(m_CheckDconfRestore, Gtk::PACK_SHRINK);
-    
-    m_CheckThemesRestore.set_active(true);
-    m_CheckIconsRestore.set_active(true);
-    m_CheckWallpapersRestore.set_active(true);
-    m_CheckExtensionsRestore.set_active(true);
-    m_CheckDconfRestore.set_active(true);
-
-    m_CheckDryRunRestore.set_active(true); 
     m_VBoxRestore.pack_start(m_CheckDryRunRestore, Gtk::PACK_SHRINK);
-    
-    m_ButtonRestore.set_size_request(-1, 45);
     m_VBoxRestore.pack_end(m_ButtonRestore, Gtk::PACK_SHRINK);
 
     m_Notebook.append_page(m_VBoxBackup, "Backup");
     m_Notebook.append_page(m_VBoxRestore, "Restore");
+    
+    m_BottomBox.set_border_width(10);
+    m_StatusLabel.set_halign(Gtk::ALIGN_START);
+    m_BottomBox.pack_start(m_StatusLabel, Gtk::PACK_EXPAND_WIDGET);
+    m_BottomBox.pack_end(m_CheckDebugMode, Gtk::PACK_SHRINK);
 
-    m_MainLayout.pack_start(m_Notebook, Gtk::PACK_EXPAND_WIDGET);
+    m_MainLayout.pack_start(m_Notebook, Gtk::PACK_SHRINK);
     m_MainLayout.pack_start(m_ScrolledWindow, Gtk::PACK_EXPAND_WIDGET);
-    m_MainLayout.pack_start(m_StatusLabel, Gtk::PACK_SHRINK);
+    m_MainLayout.pack_start(m_BottomBox, Gtk::PACK_SHRINK);
 
     m_ButtonBackup.signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::on_button_backup_clicked));
     m_ButtonRestore.signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::on_button_restore_clicked));
+    m_ButtonSelectVault.signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::on_button_select_vault_clicked));
 
     add(m_MainLayout);
     show_all_children();
-    add_log_ui("Session Started. Multithreaded Engine Ready.");
 }
 
-MainWindow::~MainWindow() {
-    if (m_WorkerRunning) {
-        add_log_ui("Warning: Waiting for background worker to finish before closing...");
-        while (m_WorkerRunning) std::this_thread::sleep_for(std::chrono::milliseconds(100));
+MainWindow::~MainWindow() {}
+
+void MainWindow::scan_vault_contents(const std::string& path) {
+    struct archive *a = archive_read_new();
+    struct archive_entry *entry;
+    archive_read_support_format_all(a);
+    archive_read_support_filter_all(a);
+    std::set<std::string> found;
+    if (archive_read_open_filename(a, path.c_str(), 10240) == ARCHIVE_OK) {
+        while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
+            std::string p = archive_entry_pathname(entry);
+            if (p.find("themes.tar.gz") != std::string::npos) found.insert("themes");
+            if (p.find("icons.tar.gz") != std::string::npos) found.insert("icons");
+            if (p.find("wallpapers.tar.gz") != std::string::npos) found.insert("wallpapers");
+            if (p.find("extensions.tar.gz") != std::string::npos) found.insert("extensions");
+            if (p.find("settings.ini") != std::string::npos) found.insert("dconf");
+        }
     }
-    if (m_LogFile.is_open()) m_LogFile.close();
+    archive_read_free(a);
+    m_CheckThemesRestore.set_active(found.count("themes"));
+    m_CheckIconsRestore.set_active(found.count("icons"));
+    m_CheckWallpapersRestore.set_active(found.count("wallpapers"));
+    m_CheckExtensionsRestore.set_active(found.count("extensions"));
+    m_CheckDconfRestore.set_active(found.count("dconf"));
 }
 
-void MainWindow::queue_log(const std::string& message) {
-    bool needs_emit = false;
-    {
-        std::lock_guard<std::mutex> lock(m_LogMutex);
-        needs_emit = m_LogQueue.empty(); 
-        m_LogQueue.push(message);
-    }
-    if (needs_emit) {
-        m_Dispatcher.emit();
+void MainWindow::on_button_select_vault_clicked() {
+    Gtk::FileChooserDialog dialog("Choose vault", Gtk::FILE_CHOOSER_ACTION_OPEN);
+    dialog.set_transient_for(*this);
+    dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL);
+    dialog.add_button("_Open", Gtk::RESPONSE_OK);
+    if (dialog.run() == Gtk::RESPONSE_OK) {
+        m_SelectedVaultPath = dialog.get_filename();
+        m_LabelSelectedVault.set_text("Selected: " + fs::path(m_SelectedVaultPath).filename().string());
+        scan_vault_contents(m_SelectedVaultPath);
+        add_log_ui("Vault loaded.");
     }
 }
 
-void MainWindow::on_dispatcher_ping() {
-    std::queue<std::string> local_queue;
-    {
-        std::lock_guard<std::mutex> lock(m_LogMutex);
-        std::swap(local_queue, m_LogQueue);
+void MainWindow::queue_log(const std::string& message) {
+    // Only write to disk if debug mode is explicitly checked
+    if (m_IsDebugMode) {
+        std::ofstream log_file(std::string(std::getenv("HOME")) + "/GnomeSettingsVault.log", std::ios::app);
+        if (log_file.is_open()) { log_file << message << std::endl; log_file.close(); }
     }
+    
+    std::lock_guard<std::mutex> lock(m_LogMutex);
+    m_LogQueue.push(message);
+    m_Dispatcher.emit();
+}
 
-    while (!local_queue.empty()) {
-        std::string msg = local_queue.front();
-        local_queue.pop();
-
+void MainWindow::on_dispatcher_ping() {
+    std::lock_guard<std::mutex> lock(m_LogMutex);
+    while (!m_LogQueue.empty()) {
+        std::string msg = m_LogQueue.front();
+        m_LogQueue.pop();
         if (msg == "__UNLOCK_UI__") {
             set_ui_locked(false);
-            m_StatusLabel.set_text("Operation completed safely.");
+            
+            // Trigger Logout Prompt if it was a successful restore
+            if (m_JobSuccess && m_LastJobWasRestore) {
+                Gtk::MessageDialog dialog(*this, "Restore Complete", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO);
+                dialog.set_secondary_text("Settings and components have been successfully restored.\n\nGNOME needs to restart to apply all changes smoothly. Would you like to log out now?");
+                if (dialog.run() == Gtk::RESPONSE_YES) {
+                    system("gnome-session-quit --logout --no-prompt &");
+                }
+            }
         } else {
             add_log_ui(msg);
         }
@@ -170,297 +193,269 @@ void MainWindow::on_dispatcher_ping() {
 }
 
 void MainWindow::add_log_ui(const std::string& message) {
-    auto now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-    std::stringstream ss;
-    ss << std::put_time(std::localtime(&now), "[%H:%M:%S] ") << message << "\n";
-    std::string formatted = ss.str();
-
-    m_RefTextBuffer->insert(m_RefTextBuffer->end(), formatted);
-    
-    Gtk::TextBuffer::iterator iter = m_RefTextBuffer->end();
-    m_RefTextBuffer->place_cursor(iter);
-
-    // THE FIX: Do not attempt to scroll if the window isn't painted on the screen yet!
-    // This stops GTK from segfaulting when trying to calculate geometries in the void.
-    if (m_LogView.get_realized()) {
-        m_LogView.scroll_to(m_RefTextBuffer->get_insert());
-    }
-
-    if (m_LogFile.is_open()) {
-        m_LogFile << formatted;
-        m_LogFile.flush();
-    }
+    m_RefTextBuffer->insert(m_RefTextBuffer->end(), message + "\n");
+    auto mark = m_RefTextBuffer->get_mark("last_line");
+    m_RefTextBuffer->move_mark(mark, m_RefTextBuffer->end());
+    if (m_LogView.get_realized()) m_LogView.scroll_to(mark);
 }
 
 void MainWindow::set_ui_locked(bool locked) {
     m_ButtonBackup.set_sensitive(!locked);
     m_ButtonRestore.set_sensitive(!locked);
-}
-
-std::string MainWindow::get_wallpaper_directory() {
-    char buffer[256];
-    std::string result = "";
-    FILE* pipe = popen("gsettings get org.gnome.desktop.background picture-uri-dark 2>/dev/null", "r");
-    if (pipe) {
-        while (fgets(buffer, sizeof(buffer), pipe) != nullptr) result += buffer;
-        pclose(pipe);
-    }
-    size_t file_pos = result.find("file://");
-    if (file_pos != std::string::npos) {
-        std::string path = result.substr(file_pos + 7);
-        path.erase(std::remove(path.begin(), path.end(), '\''), path.end());
-        path.erase(std::remove(path.begin(), path.end(), '\n'), path.end());
-        return fs::path(path).parent_path().string();
+    m_ButtonSelectVault.set_sensitive(!locked);
+    m_CheckDebugMode.set_sensitive(!locked);
+    
+    if (!locked) {
+        m_StatusLabel.override_color(m_JobSuccess ? Gdk::RGBA("#44ff44") : Gdk::RGBA("#ff4444"));
+        m_StatusLabel.set_text(m_JobSuccess ? "Job Completed Successfully." : "Job Completed with ERRORS.");
     }
-    return "";
 }
 
-bool MainWindow::create_tar_archive(const std::string& source_dir, const std::string& out_filename) {
-    struct archive *a;
-    struct archive *disk;
-    struct archive_entry *entry;
-    char buff[8192];
-    int len, fd;
+void MainWindow::run_backup_job(JobConfig config, std::string home_dir) {
+    m_JobSuccess = true; std::error_code ec;
+    queue_log("--- Starting Backup ---");
+    std::string temp_dir = "/tmp/gvault_pack";
+    fs::remove_all(temp_dir, ec);
+    fs::create_directories(temp_dir);
 
-    a = archive_write_new();
-    archive_write_add_filter_gzip(a);
-    archive_write_set_format_pax_restricted(a);
-    archive_write_open_filename(a, out_filename.c_str());
+    if (config.themes) if(!create_tar_archive(home_dir + "/.themes", temp_dir + "/themes.tar.gz", false)) m_JobSuccess = false;
+    if (config.icons) if(!create_tar_archive(home_dir + "/.icons", temp_dir + "/icons.tar.gz", false)) m_JobSuccess = false;
+    if (config.wallpapers) {
+        std::string w_dir = get_wallpaper_directory();
+        if(!w_dir.empty()) if(!create_tar_archive(w_dir, temp_dir + "/wallpapers.tar.gz", false)) m_JobSuccess = false;
+    }
+    if (config.extensions) if(!create_tar_archive(home_dir + "/.local/share/gnome-shell/extensions", temp_dir + "/extensions.tar.gz", false)) m_JobSuccess = false;
+    
+    if (config.dconf) { 
+        queue_log("[BACKUP] Exporting GNOME Settings...");
+        if (system(("dconf dump / > " + temp_dir + "/settings.ini").c_str()) != 0) m_JobSuccess = false; 
+    }
 
-    disk = archive_read_disk_new();
-    archive_read_disk_set_standard_lookup(disk);
+    std::string final_file = home_dir + "/" + config.vault_name + ".gbk";
+    queue_log("[BACKUP] Compiling final vault...");
+    if(!create_tar_archive(temp_dir, final_file, true)) m_JobSuccess = false;
+    
+    fs::remove_all(temp_dir, ec);
+    queue_log("__UNLOCK_UI__");
+    m_WorkerRunning = false;
+}
 
-    fs::directory_options options = fs::directory_options::skip_permission_denied;
-    for (const auto& dirEntry : fs::recursive_directory_iterator(source_dir, options)) {
-        std::string path = dirEntry.path().string();
-        entry = archive_entry_new();
-        archive_entry_copy_pathname(entry, path.c_str());
-        archive_read_disk_entry_from_file(disk, entry, -1, nullptr);
-        archive_write_header(a, entry);
+void MainWindow::on_button_backup_clicked() {
+    Gtk::MessageDialog dialog(*this, "Vault Name", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL);
+    Gtk::Entry entry; entry.set_text("GnomeVaultBackup");
+    dialog.get_content_area()->pack_start(entry, Gtk::PACK_SHRINK);
+    dialog.show_all_children();
+    if (dialog.run() == Gtk::RESPONSE_OK) {
+        m_IsDebugMode = m_CheckDebugMode.get_active();
+        m_LastJobWasRestore = false;
+        set_ui_locked(true); m_WorkerRunning = true;
+        m_StatusLabel.override_color(Gdk::RGBA("#ffffff"));
+        m_StatusLabel.set_text("Backup in progress...");
         
-        queue_log("  -> Packing: " + path);
-
-        if (fs::is_regular_file(dirEntry)) {
-            fd = ::open(path.c_str(), O_RDONLY);
-            if (fd >= 0) {
-                while ((len = ::read(fd, buff, sizeof(buff))) > 0) {
-                    archive_write_data(a, buff, len);
-                }
-                ::close(fd);
-            }
-        }
-        archive_entry_free(entry);
+        JobConfig cfg;
+        cfg.themes = m_CheckThemesBackup.get_active(); cfg.icons = m_CheckIconsBackup.get_active();
+        cfg.wallpapers = m_CheckWallpapersBackup.get_active(); cfg.extensions = m_CheckExtensionsBackup.get_active();
+        cfg.dconf = m_CheckDconfBackup.get_active(); cfg.dry_run = false; cfg.vault_name = entry.get_text();
+        std::thread(&MainWindow::run_backup_job, this, cfg, std::string(std::getenv("HOME"))).detach();
     }
-    archive_read_free(disk);
-    archive_write_close(a);
-    archive_write_free(a);
-    return true;
 }
 
-bool MainWindow::extract_tar_archive(const std::string& archive_path, bool dry_run) {
-    struct archive *a;
-    struct archive_entry *entry;
-    int flags = ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_UNLINK | ARCHIVE_EXTRACT_SECURE_NODOTDOT;
-
-    a = archive_read_new();
-    archive_read_support_format_all(a);
-    archive_read_support_filter_all(a);
-
-    if (archive_read_open_filename(a, archive_path.c_str(), 10240) != ARCHIVE_OK) {
-        queue_log("Error: Failed to open archive " + archive_path);
-        archive_read_free(a);
-        return false;
+void MainWindow::run_restore_job(JobConfig config, std::string home_dir) {
+    m_JobSuccess = true; std::error_code ec;
+    queue_log("--- Starting Clean Restore ---");
+
+    auto nuke_leftovers = [&](const std::string& path) {
+        fs::remove_all(path + "_vault_new", ec);
+        fs::remove_all(path + "_vault_old", ec);
+    };
+    nuke_leftovers(home_dir + "/.themes");
+    nuke_leftovers(home_dir + "/.icons");
+    nuke_leftovers(home_dir + "/.local/share/gnome-shell/extensions");
+
+    if (config.extensions && !config.dry_run) {
+        queue_log("[SAFE] Disabling extensions to prevent GNOME crash...");
+        system("gsettings set org.gnome.shell disable-user-extensions true");
     }
 
-    while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-        std::string current_path = archive_entry_pathname(entry);
-        if (!current_path.empty() && current_path[0] != '/') {
-            current_path = "/" + current_path;
-            archive_entry_set_pathname(entry, current_path.c_str());
-        }
+    std::string temp_unpack = "/tmp/gvault_unpack";
+    fs::remove_all(temp_unpack, ec);
+    fs::create_directories(temp_unpack);
+    
+    queue_log("[RESTORE] Unpacking vault structure...");
+    if (!extract_tar_archive(config.custom_restore_path, temp_unpack, false, false)) m_JobSuccess = false;
 
-        if (dry_run) {
-            queue_log("  -> [DRY RUN] Would extract: " + current_path);
-            archive_read_data_skip(a);
-        } else {
-            queue_log("  -> Extracting: " + current_path);
-            if (archive_read_extract(a, entry, flags) != ARCHIVE_OK) {
-                queue_log("    -> Warning: Failed to extract " + current_path + " (" + archive_error_string(a) + ")");
-            }
-        }
+    std::string work_path = temp_unpack;
+    for (const auto& entry : fs::recursive_directory_iterator(temp_unpack)) {
+        if (entry.path().filename() == "settings.ini") { work_path = entry.path().parent_path().string(); break; }
     }
-    archive_read_close(a);
-    archive_read_free(a);
-    return true;
-}
-
-void MainWindow::run_backup_job(JobConfig config, std::string home_dir, std::string wallpaper_dir) {
-    queue_log("--- Starting Backup Sequence (Worker Thread) ---");
 
-    if (config.themes) {
-        std::string target = home_dir + "/.themes";
-        if (fs::exists(target)) {
-            queue_log("Backing up Themes...");
-            create_tar_archive(target, home_dir + "/gnome_themes_backup.tar.gz");
-        }
-    }
-    
-    if (config.icons) {
-        std::string target = home_dir + "/.icons";
-        if (fs::exists(target)) {
-            queue_log("Backing up Icons...");
-            create_tar_archive(target, home_dir + "/gnome_icons_backup.tar.gz");
+    auto atomic_restore = [&](const std::string& arch_name, const std::string& live_path, const std::string& label) {
+        std::string arch_full = work_path + "/" + arch_name + ".tar.gz";
+        if (fs::exists(arch_full)) {
+            queue_log("[RESTORE] Swapping " + label + "...");
+            std::string shadow = live_path + "_vault_new";
+            std::string old_path = live_path + "_vault_old";
+            
+            fs::remove_all(shadow, ec);
+            fs::remove_all(old_path, ec);
+            fs::create_directories(shadow);
+            
+            if (extract_tar_archive(arch_full, shadow, config.dry_run, false)) {
+                if (!config.dry_run) {
+                    sync();
+                    if (fs::exists(live_path)) {
+                        fs::rename(live_path, old_path, ec);
+                        if (ec) { queue_log("  !!! Warning: Could not isolate old " + label + ". Retrying via delete."); fs::remove_all(live_path, ec); }
+                    }
+                    fs::rename(shadow, live_path, ec);
+                    if (ec) { 
+                        queue_log("  !!! ERROR: Rename failed for " + label + "."); 
+                        m_JobSuccess = false; 
+                    } else { 
+                        if (m_IsDebugMode) queue_log("  -> " + label + " swapped successfully."); 
+                        fs::remove_all(old_path, ec); 
+                    }
+                }
+            } else m_JobSuccess = false;
         }
-    }
+    };
 
-    if (config.wallpapers) {
-        if (!wallpaper_dir.empty() && wallpaper_dir != home_dir && wallpaper_dir != "/") {
-            queue_log("Backing up Wallpapers from: " + wallpaper_dir);
-            create_tar_archive(wallpaper_dir, home_dir + "/gnome_wallpapers_backup.tar.gz");
-        } else {
-            queue_log("Warning: Wallpaper directory too broad or empty. Skipped.");
-        }
+    if (config.themes) atomic_restore("themes", home_dir + "/.themes", "Themes");
+    if (config.icons) atomic_restore("icons", home_dir + "/.icons", "Icons");
+    if (config.extensions) atomic_restore("extensions", home_dir + "/.local/share/gnome-shell/extensions", "Extensions");
+    
+    if (config.wallpapers && fs::exists(work_path + "/wallpapers.tar.gz")) {
+        queue_log("[RESTORE] Restoring Wallpapers...");
+        if (!extract_tar_archive(work_path + "/wallpapers.tar.gz", "/", config.dry_run, true)) m_JobSuccess = false;
     }
 
-    if (config.extensions) {
-        std::string target = home_dir + "/.local/share/gnome-shell/extensions";
-        if (fs::exists(target)) {
-            queue_log("Backing up Extensions...");
-            create_tar_archive(target, home_dir + "/gnome_extensions_backup.tar.gz");
-        }
+    if (config.dconf && fs::exists(work_path + "/settings.ini") && !config.dry_run) {
+        queue_log("[RESTORE] Injecting Dconf settings...");
+        if (system(("dconf load / < " + work_path + "/settings.ini").c_str()) != 0) m_JobSuccess = false;
     }
 
-    if (config.dconf) {
-        queue_log("Dumping dconf settings...");
-        std::string cmd = "dconf dump / > " + home_dir + "/gnome_dconf_backup.ini";
-        if (system(cmd.c_str()) == 0) {
-            queue_log("  -> Success: Dumped dconf");
-        } else {
-            queue_log("  -> Error: dconf dump failed");
-        }
+    if (config.extensions && !config.dry_run) {
+        queue_log("[SAFE] Re-enabling extensions...");
+        system("gsettings set org.gnome.shell disable-user-extensions false");
     }
 
-    queue_log("--- Backup Completed ---");
+    fs::remove_all(temp_unpack, ec);
     queue_log("__UNLOCK_UI__");
-    m_WorkerRunning = false;
 }
 
-void MainWindow::on_button_backup_clicked() {
-    if (m_WorkerRunning) return;
-
-    set_ui_locked(true);
-    m_WorkerRunning = true;
-    m_StatusLabel.set_text("Backup in progress...");
-
-    const char* env_home = std::getenv("HOME");
-    std::string home_dir = env_home ? env_home : "";
-
-    if (home_dir.empty()) {
-        add_log_ui("Error: HOME environment variable missing.");
-        set_ui_locked(false);
-        m_WorkerRunning = false;
-        return;
-    }
-
-    JobConfig config;
-    config.themes = m_CheckThemesBackup.get_active();
-    config.icons = m_CheckIconsBackup.get_active();
-    config.wallpapers = m_CheckWallpapersBackup.get_active();
-    config.extensions = m_CheckExtensionsBackup.get_active();
-    config.dconf = m_CheckDconfBackup.get_active();
-    config.dry_run = false;
-
-    std::string wallpaper_dir = get_wallpaper_directory();
-
-    std::thread(&MainWindow::run_backup_job, this, config, home_dir, wallpaper_dir).detach();
+void MainWindow::on_button_restore_clicked() {
+    if (m_SelectedVaultPath.empty()) return;
+    
+    m_IsDebugMode = m_CheckDebugMode.get_active();
+    m_LastJobWasRestore = true;
+    set_ui_locked(true); m_WorkerRunning = true;
+    
+    m_StatusLabel.override_color(Gdk::RGBA("#ffffff"));
+    m_StatusLabel.set_text("Restore in progress...");
+    
+    JobConfig cfg;
+    cfg.themes = m_CheckThemesRestore.get_active(); cfg.icons = m_CheckIconsRestore.get_active();
+    cfg.wallpapers = m_CheckWallpapersRestore.get_active(); cfg.extensions = m_CheckExtensionsRestore.get_active();
+    cfg.dconf = m_CheckDconfRestore.get_active(); cfg.dry_run = m_CheckDryRunRestore.get_active();
+    cfg.custom_restore_path = m_SelectedVaultPath;
+    
+    std::thread(&MainWindow::run_restore_job, this, cfg, std::string(std::getenv("HOME"))).detach();
 }
 
-void MainWindow::run_restore_job(JobConfig config, std::string home_dir) {
-    if (config.dry_run) {
-        queue_log("--- Starting DRY RUN Restore (Worker Thread) ---");
-        queue_log("NO FILES WILL BE MODIFIED");
-    } else {
-        queue_log("--- Starting LIVE Restore (Worker Thread) ---");
-    }
-
-    if (config.themes) {
-        std::string in = home_dir + "/gnome_themes_backup.tar.gz";
-        if (fs::exists(in)) {
-            queue_log("Processing Themes archive...");
-            extract_tar_archive(in, config.dry_run);
-        }
-    }
-
-    if (config.icons) {
-        std::string in = home_dir + "/gnome_icons_backup.tar.gz";
-        if (fs::exists(in)) {
-            queue_log("Processing Icons archive...");
-            extract_tar_archive(in, config.dry_run);
+bool MainWindow::create_tar_archive(const std::string& source_dir, const std::string& out_filename, bool strip_path) {
+    struct archive *a = archive_write_new();
+    archive_write_add_filter_gzip(a);
+    archive_write_set_format_pax_restricted(a);
+    archive_write_open_filename(a, out_filename.c_str());
+    fs::path base_path = fs::absolute(source_dir);
+    bool ok = true;
+    
+    if (m_IsDebugMode) queue_log("  -> Compressing: " + source_dir);
+
+    for (const auto& dirEntry : fs::recursive_directory_iterator(base_path, fs::directory_options::skip_permission_denied)) {
+        std::string full = dirEntry.path().string();
+        std::string store = strip_path ? fs::relative(dirEntry.path(), base_path).string() : full;
+        if (store == "." || store == "..") continue;
+        struct archive_entry *entry = archive_entry_new();
+        archive_entry_set_pathname(entry, store.c_str());
+        struct stat st;
+        if (lstat(full.c_str(), &st) != 0) { archive_entry_free(entry); ok = false; continue; }
+        archive_entry_copy_stat(entry, &st);
+        if (S_ISLNK(st.st_mode)) {
+             char link_target[4096]; ssize_t len = readlink(full.c_str(), link_target, sizeof(link_target)-1);
+             if (len != -1) { link_target[len]='\0'; archive_entry_set_symlink(entry, link_target); }
         }
-    }
-
-    if (config.wallpapers) {
-        std::string in = home_dir + "/gnome_wallpapers_backup.tar.gz";
-        if (fs::exists(in)) {
-            queue_log("Processing Wallpapers archive...");
-            extract_tar_archive(in, config.dry_run);
+        archive_write_header(a, entry);
+        if (m_IsDebugMode) queue_log("    -> Packed: " + store);
+        if (S_ISREG(st.st_mode)) {
+            int fd = ::open(full.c_str(), O_RDONLY);
+            if (fd >= 0) {
+                char buff[65536]; ssize_t len;
+                while ((len = ::read(fd, buff, sizeof(buff))) > 0) archive_write_data(a, buff, len);
+                ::close(fd);
+            } else ok = false;
         }
+        archive_entry_free(entry);
     }
+    archive_write_close(a); archive_write_free(a);
+    return ok;
+}
 
-    if (config.extensions) {
-        std::string in = home_dir + "/gnome_extensions_backup.tar.gz";
-        if (fs::exists(in)) {
-            queue_log("Processing Extensions archive...");
-            extract_tar_archive(in, config.dry_run);
+bool MainWindow::extract_tar_archive(const std::string& archive_path, const std::string& dest_dir, bool dry_run, bool use_absolute) {
+    struct archive *a = archive_read_new();
+    archive_read_support_format_all(a);
+    archive_read_support_filter_all(a);
+    if (archive_read_open_filename(a, archive_path.c_str(), 10240) != ARCHIVE_OK) return false;
+    int flags = ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_UNLINK | ARCHIVE_EXTRACT_SECURE_NODOTDOT;
+    struct archive_entry *entry;
+    bool status = true;
+    
+    while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
+        std::string stored_path = archive_entry_pathname(entry);
+        if (!use_absolute) {
+            size_t pos = stored_path.find("/.themes/");
+            if (pos == std::string::npos) pos = stored_path.find("/.icons/");
+            if (pos == std::string::npos) pos = stored_path.find("/extensions/");
+            if (pos != std::string::npos) {
+                size_t start = stored_path.find('/', pos + 1);
+                if (start != std::string::npos) stored_path = stored_path.substr(start + 1);
+            }
         }
-    }
-
-    if (config.dconf) {
-        std::string in = home_dir + "/gnome_dconf_backup.ini";
-        if (fs::exists(in)) {
-            if (config.dry_run) {
-                queue_log("  -> [DRY RUN] Would load dconf settings from " + in);
-            } else {
-                queue_log("Injecting dconf settings...");
-                std::string cmd = "dconf load / < " + in;
-                if (system(cmd.c_str()) == 0) {
-                    queue_log("  -> Success: dconf loaded");
-                } else {
-                    queue_log("  -> Error: dconf load failed");
+        std::string target = use_absolute ? archive_entry_pathname(entry) : dest_dir + "/" + stored_path;
+        archive_entry_set_pathname(entry, target.c_str());
+        
+        if (dry_run) { 
+            if (m_IsDebugMode) queue_log("    -> [DRY] " + target); 
+            archive_read_data_skip(a); 
+        } else {
+            if (use_absolute && fs::exists(target) && fs::is_regular_file(target)) {
+                int fd = ::open(target.c_str(), O_WRONLY | O_TRUNC);
+                if (fd >= 0) ::close(fd);
+            }
+            if (archive_read_extract(a, entry, flags) != ARCHIVE_OK) {
+                if (!fs::is_directory(target)) {
+                    if (m_IsDebugMode) queue_log("      !!! FAIL: " + std::string(archive_error_string(a)) + " -> " + target);
+                    status = false;
                 }
+            } else {
+                if (m_IsDebugMode) queue_log("    -> Restored: " + target);
             }
         }
     }
-
-    queue_log("--- Restore Completed ---");
-    queue_log("__UNLOCK_UI__");
-    m_WorkerRunning = false;
+    archive_read_close(a); archive_read_free(a);
+    return status;
 }
 
-void MainWindow::on_button_restore_clicked() {
-    if (m_WorkerRunning) return;
-
-    set_ui_locked(true);
-    m_WorkerRunning = true;
-    m_StatusLabel.set_text("Restore in progress...");
-
-    const char* env_home = std::getenv("HOME");
-    std::string home_dir = env_home ? env_home : "";
-
-    if (home_dir.empty()) {
-        add_log_ui("Error: HOME environment variable missing.");
-        set_ui_locked(false);
-        m_WorkerRunning = false;
-        return;
+std::string MainWindow::get_wallpaper_directory() {
+    char buffer[256]; std::string result = "";
+    FILE* pipe = popen("gsettings get org.gnome.desktop.background picture-uri-dark 2>/dev/null", "r");
+    if (pipe) { while (fgets(buffer, sizeof(buffer), pipe) != nullptr) result += buffer; pclose(pipe); }
+    size_t file_pos = result.find("file://");
+    if (file_pos != std::string::npos) {
+        std::string path = result.substr(file_pos + 7);
+        path.erase(std::remove(path.begin(), path.end(), '\''), path.end());
+        path.erase(std::remove(path.begin(), path.end(), '\n'), path.end());
+        return fs::path(path).parent_path().string();
     }
-
-    JobConfig config;
-    config.themes = m_CheckThemesRestore.get_active();
-    config.icons = m_CheckIconsRestore.get_active();
-    config.wallpapers = m_CheckWallpapersRestore.get_active();
-    config.extensions = m_CheckExtensionsRestore.get_active();
-    config.dconf = m_CheckDconfRestore.get_active();
-    config.dry_run = m_CheckDryRunRestore.get_active();
-
-    std::thread(&MainWindow::run_restore_job, this, config, home_dir).detach();
+    return "";
 }

MainWindow.hpp

@@ -1,3 +1,13 @@
+/*
+ * GnomeSettingsVault - A GNOME configuration backup utility.
+ * Copyright (C) 2026 Nicole Portas, nicole@equalmass.com
+ *
+ * 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.
+ */
+
 #pragma once
 #include <gtkmm.h>
 #include <string>
@@ -14,6 +24,8 @@ struct JobConfig {
     bool extensions;
     bool dconf;
     bool dry_run;
+    std::string vault_name;
+    std::string custom_restore_path;
 };
 
 class MainWindow : public Gtk::Window {
@@ -22,18 +34,17 @@ public:
     virtual ~MainWindow();
 
 private:
-    // Core Layout
     Gtk::HeaderBar m_HeaderBar;
     Gtk::Box m_MainLayout;
     Gtk::Notebook m_Notebook;
-    
-    // Logging UI
     Gtk::ScrolledWindow m_ScrolledWindow;
     Gtk::TextView m_LogView;
     Glib::RefPtr<Gtk::TextBuffer> m_RefTextBuffer;
+    
+    Gtk::Box m_BottomBox;
     Gtk::Label m_StatusLabel;
+    Gtk::CheckButton m_CheckDebugMode;
 
-    // --- Backup Page Elements ---
     Gtk::Box m_VBoxBackup;
     Gtk::Label m_LabelBackupInstruction;
     Gtk::CheckButton m_CheckThemesBackup;
@@ -43,9 +54,10 @@ private:
     Gtk::CheckButton m_CheckDconfBackup;
     Gtk::Button m_ButtonBackup;
 
-    // --- Restore Page Elements ---
     Gtk::Box m_VBoxRestore;
     Gtk::Label m_LabelRestoreInstruction;
+    Gtk::Button m_ButtonSelectVault;
+    Gtk::Label m_LabelSelectedVault;
     Gtk::CheckButton m_CheckThemesRestore;
     Gtk::CheckButton m_CheckIconsRestore;
     Gtk::CheckButton m_CheckWallpapersRestore;
@@ -54,28 +66,26 @@ private:
     Gtk::CheckButton m_CheckDryRunRestore;
     Gtk::Button m_ButtonRestore;
 
-    // --- Threading & Concurrency ---
     Glib::Dispatcher m_Dispatcher;
     std::mutex m_LogMutex;
     std::queue<std::string> m_LogQueue;
     std::atomic<bool> m_WorkerRunning;
-    std::ofstream m_LogFile;
+    std::atomic<bool> m_JobSuccess; 
+    std::atomic<bool> m_IsDebugMode;
+    std::atomic<bool> m_LastJobWasRestore;
+    std::string m_SelectedVaultPath;
 
-    // --- Signal Handlers and Logic ---
     void on_button_backup_clicked();
     void on_button_restore_clicked();
-    
-    // --- UI Thread Functions ---
+    void on_button_select_vault_clicked();
     void on_dispatcher_ping();
     void add_log_ui(const std::string& message);
     void set_ui_locked(bool locked);
-
-    // --- Worker Thread Functions ---
     void queue_log(const std::string& message);
-    void run_backup_job(JobConfig config, std::string home_dir, std::string wallpaper_dir);
+    void scan_vault_contents(const std::string& path);
+    void run_backup_job(JobConfig config, std::string home_dir);
     void run_restore_job(JobConfig config, std::string home_dir);
-    
-    bool create_tar_archive(const std::string& source_dir, const std::string& out_filename);
-    bool extract_tar_archive(const std::string& archive_path, bool dry_run);
+    bool create_tar_archive(const std::string& source_dir, const std::string& out_filename, bool strip_path);
+    bool extract_tar_archive(const std::string& archive_path, const std::string& dest_dir, bool dry_run, bool use_absolute);
     std::string get_wallpaper_directory();
 };

README.md

@@ -1,3 +1,23 @@
 # GnomeSettingsVault
 
-This app will attempt to copy, migrate and restore the core settings in Gnome
+A high-integrity backup and restore utility for GNOME environments. Unlike standard backup tools, GnomeSettingsVault uses **Atomic Swap** logic and **Live-Extension Disabling** to ensure that themes, icons, and shell extensions are restored without crashing the GNOME Shell.
+
+## Features
+* **Atomic Restore:** Extracts to shadow directories before swapping to minimize filesystem locks.
+* **Safe Extension Handling:** Automatically toggles extensions off during restore to prevent Shell segmentation faults.
+* **Dconf Integration:** Full backup of GNOME's configuration database.
+* **Debug Logging:** Optional real-time logging to `~/GnomeSettingsVault.log`.
+* **GPLv3 Licensed:** 100% Free and Open Source.
+
+## Prerequisites
+* `gtkmm-3.0`
+* `libarchive`
+* `dconf-cli`
+
+## Usage
+1. Compile using the provided `Makefile`.
+2. Run `./gnome-vault`.
+3. After a restore, a **Logout** is highly recommended to flush the GNOME cache and apply all UI changes correctly.
+
+## Contributing
+As GNOME moves toward versions 49 and 50, please report any path changes or extension API breakages via Issues.

main.cpp

@@ -7,27 +7,24 @@
 #include <string>
 
 int main(int argc, char *argv[]) {
-    // --- THE HIJACK: Force Fontconfig to use a writable /tmp directory ---
-    // This stops Pango from shitting the bed on headless/restrictive servers
+    // --- Environment Hijack for Fontconfig ---
     const char* user = std::getenv("USER");
     std::string safe_cache_dir = std::string("/tmp/gnome-vault-cache-") + (user ? user : "default");
-    
-    // Create the temporary directory (0777 gives it wide open permissions)
     mkdir(safe_cache_dir.c_str(), 0777);
-    
-    // Forcibly inject this into the environment before GTK boots
     setenv("XDG_CACHE_HOME", safe_cache_dir.c_str(), 1);
 
-    // --- Standard GTK Initialization ---
+    // Set Program Name for WmClass / Task Bar
+    g_set_prgname("gnomesettingsvault");
+    g_set_application_name("GnomeSettingsVault");
+
     if (!gtk_init_check(&argc, &argv)) {
         std::cerr << "Bloody hell: GTK failed to initialize." << std::endl;
-        std::cerr << "Your X11/Wayland display is either missing or rejecting the connection." << std::endl;
-        std::cerr << "If you are on SSH, ensure you used 'ssh -X' and your local X server is running." << std::endl;
         return 1;
     }
 
     try {
-        auto app = Gtk::Application::create(argc, argv, "org.gnome.vault");
+        // Application ID also helps define the WmClass
+        auto app = Gtk::Application::create(argc, argv, "org.gnome.settingsvault");
         MainWindow window;
         return app->run(window);
     } catch (const Glib::Error& ex) {