From 054f2aa52410081a6761e071fad48d3e999a8ce1 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 27 Jul 2012 11:35:50 +0200 Subject: [PATCH 01/73] Cleanup main app code. --- bin/qasim-gui.rb | 57 +++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index ef4bd12..4ae3055 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -26,7 +26,12 @@ end module Qasim - class QasimGui + class QasimApp + def initialize + end + end + + class QasimGui < QasimApp def initialize @@ -207,32 +212,27 @@ module Qasim end - # - # - # - def run - # create lock - have_lock = true - - FileUtils.mkdir_p APP_CONFIG_DIR unless File.exist? APP_CONFIG_DIR - lockfname = File.join APP_CONFIG_DIR, "lock" - fd = IO::sysopen( lockfname, - Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT) - f = IO.open(fd) - f.syswrite( "#{Process.pid}\n" ) - f.close - @app.exec - rescue Errno::EEXIST => e - # test if the other process still exist - masterpid = File.read(lockfname).strip + def lock_set begin + # create lock + have_lock = true + + FileUtils.mkdir_p APP_CONFIG_DIR unless File.exist? APP_CONFIG_DIR + lockfname = File.join APP_CONFIG_DIR, "lock" + fd = IO::sysopen( lockfname, + Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT) + f = IO.open(fd) + f.syswrite( "#{Process.pid}\n" ) + f.close + rescue Errno::EEXIST => e + # test if the other process still exist + masterpid = File.read(lockfname).strip # FIXME: test if the other process exists other_path = "/proc/#{masterpid.to_i}" if File.exists? other_path then cmdline = File.read( File.join( other_path, 'cmdline' ) ) if cmdline =~ /qasim/ then - warn "error: Another instance of %s is already running." % APP_NAME - exit 1 + raise LockError, "Another instance of %s is already running." % APP_NAME end end fd = IO::sysopen( lockfname, @@ -240,15 +240,26 @@ module Qasim f = IO.open(fd) f.syswrite( "#{Process.pid}\n" ) f.close - @app.exec end - ensure + end + + def lock_unset masterpid = File.read(lockfname).strip if masterpid.to_i == Process.pid then FileUtils.rm lockfname end end + # + # + # + def run + lock_set + @app.exec + ensure + lock_unset + end + # # From c576b59d1624f943358e9a5eb7d618b54cddb653 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 27 Jul 2012 11:41:34 +0200 Subject: [PATCH 02/73] parse_map now checks if directory exists. --- lib/qasim/config.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/qasim/config.rb b/lib/qasim/config.rb index 4b74ef9..0162c06 100644 --- a/lib/qasim/config.rb +++ b/lib/qasim/config.rb @@ -35,7 +35,10 @@ module Qasim #rdebug "Config: #{@config_dir}/config" @maps = [] - Find.find( @config_dir, APP_SYSCONFIG_DIR ) do |path| + map_dirs = [@config_dir, APP_SYSCONFIG_DIR].select{ |d| + File.exists? d and File.directory? d + } + Find.find( *map_dirs ) do |path| if File.file? path if File.basename( path ) =~ /.map$/ begin From ac482410ce45840ed485cbf3ea8f82d186dd1af7 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 27 Jul 2012 11:46:58 +0200 Subject: [PATCH 03/73] Makefile: fix installation paths. --- Makefile | 6 +----- lib/qasim/Makefile | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 lib/qasim/Makefile diff --git a/Makefile b/Makefile index bb3fc37..f83adfc 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,6 @@ RUBYVERSION=1.8 RDOC=rdoc$(RUBYVERSION) all: - $(MAKE) -C $(NAME) - -clean: - $(MAKE) -C $(NAME) clean doc: build-doc @@ -50,7 +46,7 @@ install-bin: #install -D -o root -g root -m 755 $(CURDIR)/bin/$(NAME)-gui.rb $(BINDIR)/$(NAME)-gui install-lib: - for libfile in $(NAME)/*.rb ; do \ + for libfile in lib/*.rb lib/**/*.rb ; do \ install -D -o root -g root -m 644 $$libfile $(SHAREDIR)/$(NAME)/$$libfile; \ done diff --git a/lib/qasim/Makefile b/lib/qasim/Makefile deleted file mode 100644 index c2e8812..0000000 --- a/lib/qasim/Makefile +++ /dev/null @@ -1,4 +0,0 @@ - -clean: - - From 39788ae5cbed4c00dff859a9d937605704ccba96 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 27 Jul 2012 11:50:34 +0200 Subject: [PATCH 04/73] Makefile: added clean rule. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index f83adfc..e0c94d9 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,8 @@ RDOC=rdoc$(RUBYVERSION) all: +clean: + doc: build-doc .PHONY: build-doc From aa0a0d31843d5e9e3e78ba09149728c35ff31dd3 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 15:20:21 +0200 Subject: [PATCH 05/73] Updated licence files. --- LICENSE-GPL-3 | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 19 ++ 2 files changed, 693 insertions(+) create mode 100644 LICENSE-GPL-3 diff --git a/LICENSE-GPL-3 b/LICENSE-GPL-3 new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE-GPL-3 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. diff --git a/README.md b/README.md index f411a7f..6f8e240 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,22 @@ or apt-get install ruby-qt4 + +Copyright & License +------------------- + +Copyright (C) 2010-2012 Glenn Y. Rolland + +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 . + From 05ea4efeee892c6e6dd16522f62e65f451503da4 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 16:34:06 +0200 Subject: [PATCH 06/73] Added QtDesigner UI files. --- lib/qasim/ui/about.ui | 197 ++++++++++++++++++++++++++++++++++++ lib/qasim/ui/listmaps.ui | 59 +++++++++++ lib/qasim/ui/preferences.ui | 84 +++++++++++++++ 3 files changed, 340 insertions(+) create mode 100644 lib/qasim/ui/about.ui create mode 100644 lib/qasim/ui/listmaps.ui create mode 100644 lib/qasim/ui/preferences.ui diff --git a/lib/qasim/ui/about.ui b/lib/qasim/ui/about.ui new file mode 100644 index 0000000..c78cfd6 --- /dev/null +++ b/lib/qasim/ui/about.ui @@ -0,0 +1,197 @@ + + + About + + + + 0 + 0 + 519 + 461 + + + + About + + + true + + + + + + + + + + + + + :/qasim/icons/qasim.svg + + + + + + + + 0 + 0 + + + + <html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Qasim vVERSION (DATE)</span></p></body></html> + + + + + + + + + true + + + + 400 + 300 + + + + + + + 3 + + + + About + + + + + + + 0 + 0 + + + + + 300 + 200 + + + + <html><head/><body><p align="center">A cross playform SSHFS Mapping tool.</p><p align="center">Copyright © 2011-2012 The Qasim Team</p><p align="center"><br/></p><p align="center"><a href="http://github.com/Glenux/Qasim"><span style=" text-decoration: underline; color:#0057ae;">http://github.com/Glenux/Qasim</span></a></p></body></html> + + + false + + + 10 + + + + + + + + Authors + + + + + + + 0 + 0 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Glenn Y. Rolland</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> E-mail: <a href="mailto:glenux@glenux.net"><span style=" text-decoration: underline; color:#0057ae;">glenux@glenux.net</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Maintainer and Original Author</p></body></html> + + + + + + + + Thanks to + + + + + + + + + + License + + + + + + + 300 + 200 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">THE LICENCE&lt;resource type=&quot;other&quot; file=&quot;:/qasim/LICENSE-GPL-3&quot;/&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;resource type=&quot;other&quot; file=&quot;:/qasim/LICENSE-GPL-3&quot;/&gt;</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close + + + + + + + + + + + buttonBox + accepted() + About + close() + + + 259 + 441 + + + 259 + 230 + + + + + diff --git a/lib/qasim/ui/listmaps.ui b/lib/qasim/ui/listmaps.ui new file mode 100644 index 0000000..eb3ed22 --- /dev/null +++ b/lib/qasim/ui/listmaps.ui @@ -0,0 +1,59 @@ + + + MapList + + + + 0 + 0 + 238 + 293 + + + + Form + + + + + + + + + + + + + ... + + + + + + + ... + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + diff --git a/lib/qasim/ui/preferences.ui b/lib/qasim/ui/preferences.ui new file mode 100644 index 0000000..a0c10f3 --- /dev/null +++ b/lib/qasim/ui/preferences.ui @@ -0,0 +1,84 @@ + + + MapDialog + + + + 0 + 0 + 554 + 414 + + + + Preferences + + + + + + + + + 0 + 0 + + + + <html><head/><body><p><span style=" font-weight:600;">Configure SSHFS maps</span></p></body></html> + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Apply|QDialogButtonBox::Discard|QDialogButtonBox::Reset + + + + + + + + + buttonBox + accepted() + MapDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + MapDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + From 722e78db3a201e2f9c18116fd548f48f137a9ed0 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 16:34:17 +0200 Subject: [PATCH 07/73] Git: ignore compiled UI & QRC files. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f963259..b9efdf8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ debian/qasim/ qasim/map_view_ui.rb destdir/ debian/qasim/ +*_ui.rb +*_qrc.rb From dee06335d623b85a59ffb84ed8f867c00204b79b Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 16:34:35 +0200 Subject: [PATCH 08/73] Makefile: Updates for UI & QRC. --- Makefile | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index bb3fc37..0b38728 100644 --- a/Makefile +++ b/Makefile @@ -9,26 +9,49 @@ SHAREDIR=$(DESTDIR)/usr/share RUBYVERSION=1.8 RDOC=rdoc$(RUBYVERSION) -all: - $(MAKE) -C $(NAME) +all: \ + build \ + install -clean: - $(MAKE) -C $(NAME) clean +clean: \ + clean-ui \ + clean-qrc \ + clean-bin \ + clean-lib \ + clean-data \ + clean-doc +build: \ + build-ui \ + build-qrc \ + build-bin \ + build-lib \ + build-data + doc: build-doc +install: \ + install-ui \ + install-qrc \ + install-bin \ + install-lib \ + install-data + +## DOC SECTION + .PHONY: build-doc -build-doc: +clean-doc: rm -fr doc + +build-doc: clean-doc $(RDOC) \ --promiscuous \ --inline-source \ --line-numbers \ - -o doc $(NAME)/ \ + -o doc lib/$(NAME)/ \ bin/ # --diagram - # install-doc: # # install documentation @@ -37,7 +60,45 @@ install-doc: cp -a doc $(DOCDIR)/$(NAME) -install: install-bin install-lib install-data +## QRC -> QRC_RB SECTION + +QRC_FILES=$(wildcard lib/$(NAME)/*.qrc) +RBQRC_FILES=$(patsubst %.qrc,%_qrc.rb,$(QRC_FILES)) + +clean-qrc: + rm -f $(RBQRC_FILES) + +build-qrc: $(RBQRC_FILES) + echo $(RBQRC_FILES) + +install-qrc: $(RBQRC_FILES) + # FIXME install qrc + +%_qrc.rb: %.qrc + rbrcc $< -o $@ + +## UI -> UI_RB SECTION + +UI_FILES=$(wildcard lib/$(NAME)/ui/*.ui) +RBUI_FILES=$(patsubst %.ui,%_ui.rb,$(UI_FILES)) + +clean-ui: + rm -f $(RBUI_FILES) + +build-ui: $(RBUI_FILES) + echo $(RBUI_FILES) + +install-ui: $(RBUI_FILES) + # FIXME install + +%_ui.rb: %.ui + rbuic4 -x $< -o $@ + + +## BINARY SECTION + +clean-bin: + # make no sense in ruby install-bin: mkdir -p $(BINDIR) @@ -49,11 +110,21 @@ install-bin: done #install -D -o root -g root -m 755 $(CURDIR)/bin/$(NAME)-gui.rb $(BINDIR)/$(NAME)-gui +## LIB SECTION + +clean-lib: + # make no sense in ruby + install-lib: for libfile in $(NAME)/*.rb ; do \ install -D -o root -g root -m 644 $$libfile $(SHAREDIR)/$(NAME)/$$libfile; \ done + +## DATA SECTION + +clean-data: + install-data: ## Install man pages # mkdir -p $(MANDIR)/man1 @@ -85,6 +156,9 @@ install-data: cat examples/$$f | gzip -f9 > $(DOCDIR)/$(NAME)/examples/$$f.gz ; \ done + +## OTHER + .PHONY: destdir destdir: rm -fr destdir From 2b3ee2eafa72df25c281c14addc39cf17fcb1847 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 16:34:47 +0200 Subject: [PATCH 09/73] Added QRC file. --- lib/qasim/qasim.qrc | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lib/qasim/qasim.qrc diff --git a/lib/qasim/qasim.qrc b/lib/qasim/qasim.qrc new file mode 100644 index 0000000..1100fea --- /dev/null +++ b/lib/qasim/qasim.qrc @@ -0,0 +1,6 @@ + + + LICENSE-GPL-3 + icons/qasim.svg + + From 9b42a5e0fae6b469d88ed553c5c3464aa8c77a3e Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 16:36:23 +0200 Subject: [PATCH 10/73] Makefile: Added missing sections for build. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b38728..e468ed6 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,8 @@ install-ui: $(RBUI_FILES) clean-bin: # make no sense in ruby +build-bin: + install-bin: mkdir -p $(BINDIR) for binfile in bin/*.rb ; do \ @@ -113,7 +115,8 @@ install-bin: ## LIB SECTION clean-lib: - # make no sense in ruby + +build-lib: install-lib: for libfile in $(NAME)/*.rb ; do \ @@ -125,6 +128,8 @@ install-lib: clean-data: +build-data: + install-data: ## Install man pages # mkdir -p $(MANDIR)/man1 From 7627a286a99d78948e48cf18050c53ca1d276872 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 16:36:38 +0200 Subject: [PATCH 11/73] qasim.qrc: fixed paths to resources. --- lib/qasim/qasim.qrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/qasim/qasim.qrc b/lib/qasim/qasim.qrc index 1100fea..36c255a 100644 --- a/lib/qasim/qasim.qrc +++ b/lib/qasim/qasim.qrc @@ -1,6 +1,6 @@ - LICENSE-GPL-3 - icons/qasim.svg + ../../LICENSE-GPL-3 + ../../icons/qasim.svg From 967eea139af454532635b1239d7f1fcebd109545 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 16:55:42 +0200 Subject: [PATCH 12/73] qasim-gui: Clean handling of lock file & lock-related exception. --- bin/qasim-gui.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index 4ae3055..98dc54b 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -1,5 +1,6 @@ #!/usr/bin/env ruby +require 'rubygems' require 'Qt4' $DEBUG = true @@ -33,6 +34,7 @@ module Qasim class QasimGui < QasimApp + class LockError < RuntimeError ; end def initialize @config = Config.new @@ -227,7 +229,6 @@ module Qasim rescue Errno::EEXIST => e # test if the other process still exist masterpid = File.read(lockfname).strip - # FIXME: test if the other process exists other_path = "/proc/#{masterpid.to_i}" if File.exists? other_path then cmdline = File.read( File.join( other_path, 'cmdline' ) ) @@ -244,6 +245,9 @@ module Qasim end def lock_unset + # remove lock if it exists + lockfname = File.join APP_CONFIG_DIR, "lock" + return unless File.exist? lockfname masterpid = File.read(lockfname).strip if masterpid.to_i == Process.pid then FileUtils.rm lockfname @@ -256,6 +260,9 @@ module Qasim def run lock_set @app.exec + exit 0 + rescue LockError + exit 1 ensure lock_unset end From 8d66cbc53792d6c2dac2fb8723e7d02ee104af30 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sat, 28 Jul 2012 17:00:00 +0200 Subject: [PATCH 13/73] qasim-gui: Use resource file for systray icon. --- bin/qasim-gui.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index 98dc54b..0e57366 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -19,6 +19,8 @@ require 'qasim/constants' require 'qasim/config' require 'qasim/map' +require 'qasim/qasim_qrc' + # QaSiM // Qt Sshfs Mapper def _ str @@ -181,7 +183,7 @@ module Qasim @app = Qt::Application.new(ARGV) si = Qt::SystemTrayIcon.new - std_icon = Qt::Icon.new( File.join APP_ICON_PATH, "qasim.svg" ) + std_icon = Qt::Icon.new( ":/qasim/qasim-icon" ) #File.join APP_ICON_PATH, "qasim.svg" ) alt_icon = Qt::Icon.new blinking = false From 85028d2d406ffa96ff6d762b331fce30e872a9a3 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 01:43:23 +0200 Subject: [PATCH 14/73] Added Autoload for About. --- lib/qasim.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/qasim.rb b/lib/qasim.rb index 5967adc..b1d33ad 100644 --- a/lib/qasim.rb +++ b/lib/qasim.rb @@ -5,5 +5,6 @@ require 'qasim/constants' module Qasim autoload :Config, 'qasim/config' autoload :Map, 'qasim/map' + autoload :About, 'qasim/about' end From 4d80e4a2a5eb56bce7f1eddb3caf8b3a955e96fd Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 01:43:41 +0200 Subject: [PATCH 15/73] qasim-gui: prepare for About. --- bin/qasim-gui.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index 0e57366..4fa8367 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -18,6 +18,7 @@ $:.push QASIM_INCLUDE_DIR require 'qasim/constants' require 'qasim/config' require 'qasim/map' +require 'qasim/about' require 'qasim/qasim_qrc' @@ -162,7 +163,10 @@ module Qasim act_about = Qt::Action.new '&About', @context_menu act_about.setIcon( Qt::Icon::fromTheme("help-about") ) rescue nil act_about.setIconVisibleInMenu true - act_about.setEnabled false + act_about.setEnabled true + act_about.connect(SIGNAL(:triggered)) do + puts "Show about dialog!" + end @context_menu.addAction act_about; @context_menu.addSeparator @@ -183,7 +187,9 @@ module Qasim @app = Qt::Application.new(ARGV) si = Qt::SystemTrayIcon.new - std_icon = Qt::Icon.new( ":/qasim/qasim-icon" ) #File.join APP_ICON_PATH, "qasim.svg" ) + std_icon = Qt::Icon.new( ":/qasim/qasim-icon" ) + #std_icon = Qt::Icon.new( File.join APP_ICON_PATH, "qasim.svg" ) + #std_icon = Qt::Icon.new alt_icon = Qt::Icon.new blinking = false From 9c2a60486f469bba1681ec1738851e10663e08a0 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 01:44:05 +0200 Subject: [PATCH 16/73] Added about class. --- lib/qasim/about.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/qasim/about.rb diff --git a/lib/qasim/about.rb b/lib/qasim/about.rb new file mode 100644 index 0000000..0586adb --- /dev/null +++ b/lib/qasim/about.rb @@ -0,0 +1,8 @@ + +require 'qasim/ui/about_ui' + +module Qasim + class AboutUi < Ui::About + + end +end From 13e4aa59154e9ef8df4b2fbf138350e6af85af1e Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 19:28:54 +0200 Subject: [PATCH 17/73] Added autoload for Ui files. --- lib/qasim/ui.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lib/qasim/ui.rb diff --git a/lib/qasim/ui.rb b/lib/qasim/ui.rb new file mode 100644 index 0000000..e0e110e --- /dev/null +++ b/lib/qasim/ui.rb @@ -0,0 +1,6 @@ + +require 'qasim/constants' + +module Qasim ; module Ui + autoload :About, 'qasim/ui/about' +end ; end From 4f12493604d7f08861422926d360a35100dcbb3a Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 19:31:21 +0200 Subject: [PATCH 18/73] Moved about elsewhere. --- lib/qasim/about.rb | 8 -------- lib/qasim/ui/about.rb | 11 +++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 lib/qasim/about.rb create mode 100644 lib/qasim/ui/about.rb diff --git a/lib/qasim/about.rb b/lib/qasim/about.rb deleted file mode 100644 index 0586adb..0000000 --- a/lib/qasim/about.rb +++ /dev/null @@ -1,8 +0,0 @@ - -require 'qasim/ui/about_ui' - -module Qasim - class AboutUi < Ui::About - - end -end diff --git a/lib/qasim/ui/about.rb b/lib/qasim/ui/about.rb new file mode 100644 index 0000000..0072e1c --- /dev/null +++ b/lib/qasim/ui/about.rb @@ -0,0 +1,11 @@ + +require 'qasim/ui/about_ui' + +module Qasim ; module Ui + class About + def initialize + setup_ui(self) + end + end + +end ; end From f97de2c2625ba3de23e71915edf4fe537a72a42c Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 19:31:39 +0200 Subject: [PATCH 19/73] Makefile: postprocess _ui.rb files. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index cd6c274..a242bce 100644 --- a/Makefile +++ b/Makefile @@ -93,6 +93,9 @@ install-ui: $(RBUI_FILES) %_ui.rb: %.ui rbuic4 -x $< -o $@ + sed -e 's/^module Ui/module Qasim ; module Ui/' \ + -e 's/^end # module Ui/end ; end # module Qasim and Ui/' \ + -i $@ ## BINARY SECTION From e94b330ac1e0d6e19f12f819985e5cae59948add Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 19:31:58 +0200 Subject: [PATCH 20/73] qasim.rb: Autoload Ui classes. --- lib/qasim.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qasim.rb b/lib/qasim.rb index b1d33ad..877a907 100644 --- a/lib/qasim.rb +++ b/lib/qasim.rb @@ -5,6 +5,6 @@ require 'qasim/constants' module Qasim autoload :Config, 'qasim/config' autoload :Map, 'qasim/map' - autoload :About, 'qasim/about' + autoload :Ui, 'qasim/ui' end From 1a95eccc53f8e67aba2f3ebdb87016bb6d10679f Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 19:41:31 +0200 Subject: [PATCH 21/73] Removed executable section. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a242bce..0138d3f 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ install-ui: $(RBUI_FILES) # FIXME install %_ui.rb: %.ui - rbuic4 -x $< -o $@ + rbuic4 $< -o $@ sed -e 's/^module Ui/module Qasim ; module Ui/' \ -e 's/^end # module Ui/end ; end # module Qasim and Ui/' \ -i $@ From 4b111fbf66201653ec382244fd1e1c6473d6f58e Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 19:46:37 +0200 Subject: [PATCH 22/73] Makefile Remove useless parts.of ui files. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0138d3f..3ba57d5 100644 --- a/Makefile +++ b/Makefile @@ -93,8 +93,7 @@ install-ui: $(RBUI_FILES) %_ui.rb: %.ui rbuic4 $< -o $@ - sed -e 's/^module Ui/module Qasim ; module Ui/' \ - -e 's/^end # module Ui/end ; end # module Qasim and Ui/' \ + sed -e '/^module Ui/,/^end # module Ui/d' -i $@ From da1ce227232e0502c72ae202c372ef38ec1e5a79 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 19:47:03 +0200 Subject: [PATCH 23/73] bin: Improve requirements. --- bin/qasim-gui.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index 4fa8367..a1a9eb4 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -15,10 +15,7 @@ QASIM_DATA_DIR = "." $:.push QASIM_INCLUDE_DIR -require 'qasim/constants' -require 'qasim/config' -require 'qasim/map' -require 'qasim/about' +require 'qasim' require 'qasim/qasim_qrc' @@ -166,6 +163,8 @@ module Qasim act_about.setEnabled true act_about.connect(SIGNAL(:triggered)) do puts "Show about dialog!" + dialog = Qasim::Ui::About.new + dialog.show end @context_menu.addAction act_about; From f1e7f80ae0e3b4e2234cc338f5376e8ee99a338d Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Jul 2012 19:47:17 +0200 Subject: [PATCH 24/73] ui/about: fix instantiation. --- lib/qasim/ui/about.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/qasim/ui/about.rb b/lib/qasim/ui/about.rb index 0072e1c..0936df0 100644 --- a/lib/qasim/ui/about.rb +++ b/lib/qasim/ui/about.rb @@ -2,9 +2,10 @@ require 'qasim/ui/about_ui' module Qasim ; module Ui - class About + class About < Qt::Dialog def initialize - setup_ui(self) + u = Ui_About.new + u.setup_ui(self) end end From bb46e58c4b917e404782bda9d7de4b99b61a4480 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 2 Aug 2012 11:10:25 +0200 Subject: [PATCH 25/73] Makefile: Fixed sed command line. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3ba57d5..dba048e 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ install-ui: $(RBUI_FILES) %_ui.rb: %.ui rbuic4 $< -o $@ - sed -e '/^module Ui/,/^end # module Ui/d' + sed -e '/^module Ui/,/^end # module Ui/d' \ -i $@ From 79e4cf6dd12b28d8ea84ee52e1a1103b5633b2a3 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 2 Aug 2012 11:41:36 +0200 Subject: [PATCH 26/73] about: initialize from parent object in constructor. --- lib/qasim/ui/about.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/qasim/ui/about.rb b/lib/qasim/ui/about.rb index 0936df0..c23d497 100644 --- a/lib/qasim/ui/about.rb +++ b/lib/qasim/ui/about.rb @@ -4,9 +4,12 @@ require 'qasim/ui/about_ui' module Qasim ; module Ui class About < Qt::Dialog def initialize + super u = Ui_About.new u.setup_ui(self) + + #FIXME: attach events to close + #FIXME: set first tab end end - end ; end From 0d118ad844e68830b18e55f7ceede446df848183 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 2 Aug 2012 12:19:11 +0200 Subject: [PATCH 27/73] Correctly set up the about dialog. --- lib/qasim/constants.rb | 1 + lib/qasim/ui/about.rb | 13 ++++++++++++- lib/qasim/ui/about.ui | 29 +++++++++++++++-------------- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lib/qasim/constants.rb b/lib/qasim/constants.rb index 7fa6451..22ab788 100644 --- a/lib/qasim/constants.rb +++ b/lib/qasim/constants.rb @@ -2,6 +2,7 @@ module Qasim APP_ICON_PATH = File.join QASIM_DATA_DIR, "icons" APP_NAME = "Qasim" APP_VERSION = "0.1" + APP_DATE = "2012-08-02" APP_SYSCONFIG_DIR = "/etc/qasim/maps.d" diff --git a/lib/qasim/ui/about.rb b/lib/qasim/ui/about.rb index c23d497..3bbbe52 100644 --- a/lib/qasim/ui/about.rb +++ b/lib/qasim/ui/about.rb @@ -8,7 +8,18 @@ module Qasim ; module Ui u = Ui_About.new u.setup_ui(self) - #FIXME: attach events to close + #FIXME: attach button events to dialog.close + + # Change title according to current version + title_str = "Qasim v%s (%s)" % [ Qasim::APP_VERSION, Qasim::APP_DATE ] + u.title_label.text = Qt::Application.translate( + "About", + "

#{title_str}" + + "

", + nil, + Qt::Application::UnicodeUTF8 + ) + #FIXME: set first tab end end diff --git a/lib/qasim/ui/about.ui b/lib/qasim/ui/about.ui index c78cfd6..e707505 100644 --- a/lib/qasim/ui/about.ui +++ b/lib/qasim/ui/about.ui @@ -18,21 +18,21 @@ - + - + - + - :/qasim/icons/qasim.svg + :/qasim/qasim-icon - + 0 @@ -61,7 +61,7 @@ - 3 + 0 @@ -69,7 +69,7 @@ - + 0 @@ -83,7 +83,7 @@ - <html><head/><body><p align="center">A cross playform SSHFS Mapping tool.</p><p align="center">Copyright © 2011-2012 The Qasim Team</p><p align="center"><br/></p><p align="center"><a href="http://github.com/Glenux/Qasim"><span style=" text-decoration: underline; color:#0057ae;">http://github.com/Glenux/Qasim</span></a></p></body></html> + <html><head/><body><p align="center">A cross platform SSHFS Mapping tool.</p><p align="center">Copyright © 2011-2012 The Qasim Team</p><p align="center"><br/></p><p align="center"><a href="http://github.com/Glenux/Qasim"><span style=" text-decoration: underline; color:#0057ae;">http://github.com/Glenux/Qasim</span></a></p></body></html> false @@ -101,7 +101,7 @@ - + 0 @@ -127,17 +127,17 @@ p, li { white-space: pre-wrap; } - + - + License - + 300 @@ -162,7 +162,7 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal @@ -174,11 +174,12 @@ p, li { white-space: pre-wrap; } + - buttonBox + button_box accepted() About close() From f2479e972e8509cabee59deea0619af32ed5e993 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 3 Aug 2012 00:03:04 +0200 Subject: [PATCH 28/73] data: A unique directory for resources files. --- {icons => data/icons}/qasim.128.png | Bin {icons => data/icons}/qasim.16.png | Bin {icons => data/icons}/qasim.256.png | Bin {icons => data/icons}/qasim.32.png | Bin {icons => data/icons}/qasim.64.png | Bin {icons => data/icons}/qasim.png | Bin {icons => data/icons}/qasim.svg | 0 data/text/gpl-3.0-standalone.html | 694 ++++++++++++++++++++++++++++ lib/qasim/qasim.qrc | 4 +- 9 files changed, 696 insertions(+), 2 deletions(-) rename {icons => data/icons}/qasim.128.png (100%) rename {icons => data/icons}/qasim.16.png (100%) rename {icons => data/icons}/qasim.256.png (100%) rename {icons => data/icons}/qasim.32.png (100%) rename {icons => data/icons}/qasim.64.png (100%) rename {icons => data/icons}/qasim.png (100%) rename {icons => data/icons}/qasim.svg (100%) create mode 100644 data/text/gpl-3.0-standalone.html diff --git a/icons/qasim.128.png b/data/icons/qasim.128.png similarity index 100% rename from icons/qasim.128.png rename to data/icons/qasim.128.png diff --git a/icons/qasim.16.png b/data/icons/qasim.16.png similarity index 100% rename from icons/qasim.16.png rename to data/icons/qasim.16.png diff --git a/icons/qasim.256.png b/data/icons/qasim.256.png similarity index 100% rename from icons/qasim.256.png rename to data/icons/qasim.256.png diff --git a/icons/qasim.32.png b/data/icons/qasim.32.png similarity index 100% rename from icons/qasim.32.png rename to data/icons/qasim.32.png diff --git a/icons/qasim.64.png b/data/icons/qasim.64.png similarity index 100% rename from icons/qasim.64.png rename to data/icons/qasim.64.png diff --git a/icons/qasim.png b/data/icons/qasim.png similarity index 100% rename from icons/qasim.png rename to data/icons/qasim.png diff --git a/icons/qasim.svg b/data/icons/qasim.svg similarity index 100% rename from icons/qasim.svg rename to data/icons/qasim.svg diff --git a/data/text/gpl-3.0-standalone.html b/data/text/gpl-3.0-standalone.html new file mode 100644 index 0000000..c039212 --- /dev/null +++ b/data/text/gpl-3.0-standalone.html @@ -0,0 +1,694 @@ + + + + + GNU General Public License v3.0 - GNU Project - Free Software Foundation (FSF) + + + +

GNU GENERAL PUBLIC LICENSE

+

Version 3, 29 June 2007

+ +

Copyright © 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>.

+ + diff --git a/lib/qasim/qasim.qrc b/lib/qasim/qasim.qrc index 36c255a..ca2da84 100644 --- a/lib/qasim/qasim.qrc +++ b/lib/qasim/qasim.qrc @@ -1,6 +1,6 @@ - ../../LICENSE-GPL-3 - ../../icons/qasim.svg + ../../data/text/gpl-3.0-standalone.html + ../../data/icons/qasim.svg From 6dd4069abee9feeefeaf0f4c3b042e11aee735e9 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 3 Aug 2012 00:09:11 +0200 Subject: [PATCH 29/73] data: Move all UI text as resource files. --- data/text/authors.html | 7 +++++++ data/text/thanks.html | 0 lib/qasim/qasim.qrc | 2 ++ lib/qasim/ui/about.rb | 42 ++++++++++++++++++++++++++++++++++++------ lib/qasim/ui/about.ui | 16 +++++++++------- 5 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 data/text/authors.html create mode 100644 data/text/thanks.html diff --git a/data/text/authors.html b/data/text/authors.html new file mode 100644 index 0000000..3aede20 --- /dev/null +++ b/data/text/authors.html @@ -0,0 +1,7 @@ + + +

Glenn Y. Rolland

+

E-mail: glenux@glenux.net

+

Maintainer and Original Author

diff --git a/data/text/thanks.html b/data/text/thanks.html new file mode 100644 index 0000000..e69de29 diff --git a/lib/qasim/qasim.qrc b/lib/qasim/qasim.qrc index ca2da84..a8f3385 100644 --- a/lib/qasim/qasim.qrc +++ b/lib/qasim/qasim.qrc @@ -1,5 +1,7 @@ + ../../data/text/authors.html + ../../data/text/thanks.html ../../data/text/gpl-3.0-standalone.html ../../data/icons/qasim.svg diff --git a/lib/qasim/ui/about.rb b/lib/qasim/ui/about.rb index 3bbbe52..3a5bed7 100644 --- a/lib/qasim/ui/about.rb +++ b/lib/qasim/ui/about.rb @@ -3,23 +3,53 @@ require 'qasim/ui/about_ui' module Qasim ; module Ui class About < Qt::Dialog - def initialize + def initialize(parent = nil) super - u = Ui_About.new - u.setup_ui(self) + @ui = Ui_About.new + @ui.setup_ui(self) #FIXME: attach button events to dialog.close + #Qt::Object.connect( w, SIGNAL( :clicked ), a, SLOT( :quit ) ) # Change title according to current version title_str = "Qasim v%s (%s)" % [ Qasim::APP_VERSION, Qasim::APP_DATE ] - u.title_label.text = Qt::Application.translate( + @ui.title_label.text = Qt::Application.translate( "About", - "

#{title_str}" + - "

", + title_str, nil, Qt::Application::UnicodeUTF8 ) + # Read Authors + file = Qt::File.new(':/qasim/authors') + if file.open(Qt::File::ReadOnly | Qt::File::Text) + stream = Qt::TextStream.new( file ) + @ui.authors_textedit.text = stream.readAll() + file.close + else + # FIXME handle error on authors reading + end + + # Read Thanks + file = Qt::File.new(':/qasim/thanks') + if file.open(Qt::File::ReadOnly | Qt::File::Text) + stream = Qt::TextStream.new( file ) + @ui.thanks_textedit.text = stream.readAll() + file.close + else + # FIXME handle error on thanks reading + end + + # Read License + file = Qt::File.new(':/qasim/licence-gpl3') + if file.open(Qt::File::ReadOnly | Qt::File::Text) + stream = Qt::TextStream.new( file ) + @ui.license_textedit.text = stream.readAll() + file.close + else + # FIXME handle error on licence reading + end + #FIXME: set first tab end end diff --git a/lib/qasim/ui/about.ui b/lib/qasim/ui/about.ui index e707505..f9bf9da 100644 --- a/lib/qasim/ui/about.ui +++ b/lib/qasim/ui/about.ui @@ -39,8 +39,14 @@ 0 + + + 75 + true + + - <html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Qasim vVERSION (DATE)</span></p></body></html> + Qasim vVERSION (DATE) @@ -101,7 +107,7 @@ - + 0 @@ -113,9 +119,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Glenn Y. Rolland</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> E-mail: <a href="mailto:glenux@glenux.net"><span style=" text-decoration: underline; color:#0057ae;">glenux@glenux.net</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Maintainer and Original Author</p></body></html> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> @@ -149,8 +153,6 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">THE LICENCE&lt;resource type=&quot;other&quot; file=&quot;:/qasim/LICENSE-GPL-3&quot;/&gt;</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;resource type=&quot;other&quot; file=&quot;:/qasim/LICENSE-GPL-3&quot;/&gt;</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> From 07c1ad7579a674d9cd8f81e6e415fe823251f20f Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 3 Aug 2012 01:52:14 +0200 Subject: [PATCH 30/73] Finished about dialog. --- bin/qasim-gui.rb | 24 +++++++++++++----------- lib/qasim/ui/about.rb | 4 +++- lib/qasim/ui/about.ui | 32 ++++++++++---------------------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index a1a9eb4..3c41814 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -162,9 +162,7 @@ module Qasim act_about.setIconVisibleInMenu true act_about.setEnabled true act_about.connect(SIGNAL(:triggered)) do - puts "Show about dialog!" - dialog = Qasim::Ui::About.new - dialog.show + res = @about_dialog.show end @context_menu.addAction act_about; @@ -184,26 +182,30 @@ module Qasim def build_interface @app = Qt::Application.new(ARGV) - si = Qt::SystemTrayIcon.new + #Qt.debug_level = Qt::DebugLevel::High + #Qt.debug_level = Qt::DebugLevel::Extensive + @app.setQuitOnLastWindowClosed false + + @main_win = Qt::MainWindow.new + @systray = Qt::SystemTrayIcon.new @main_win + @about_dialog = Qasim::Ui::About.new @main_win std_icon = Qt::Icon.new( ":/qasim/qasim-icon" ) - #std_icon = Qt::Icon.new( File.join APP_ICON_PATH, "qasim.svg" ) - #std_icon = Qt::Icon.new alt_icon = Qt::Icon.new blinking = false - si.icon = std_icon - si.show + @systray.icon = std_icon + @systray.show - si.setToolTip("Qasim %s" % APP_VERSION); + @systray.setToolTip("Qasim %s" % APP_VERSION); build_map_menu build_context_menu - si.contextMenu = @context_menu + @systray.contextMenu = @context_menu - si.connect(SIGNAL('activated(QSystemTrayIcon::ActivationReason)')) do |reason| + @systray.connect(SIGNAL('activated(QSystemTrayIcon::ActivationReason)')) do |reason| case reason when Qt::SystemTrayIcon::Trigger then build_map_menu diff --git a/lib/qasim/ui/about.rb b/lib/qasim/ui/about.rb index 3a5bed7..9d646d8 100644 --- a/lib/qasim/ui/about.rb +++ b/lib/qasim/ui/about.rb @@ -50,7 +50,9 @@ module Qasim ; module Ui # FIXME handle error on licence reading end - #FIXME: set first tab + # set first tab + @ui.tab_widget.setCurrentIndex(0) end + end end ; end diff --git a/lib/qasim/ui/about.ui b/lib/qasim/ui/about.ui index f9bf9da..11b629e 100644 --- a/lib/qasim/ui/about.ui +++ b/lib/qasim/ui/about.ui @@ -6,8 +6,8 @@ 0 0 - 519 - 461 + 470 + 500 @@ -53,19 +53,7 @@ - - - true - - - - 400 - 300 - - - - - + 0 @@ -105,7 +93,7 @@ Authors - + @@ -182,17 +170,17 @@ p, li { white-space: pre-wrap; } button_box - accepted() + clicked(QAbstractButton*) About - close() + accept() - 259 - 441 + 463 + 493 - 259 - 230 + 469 + 12 From f2c8c14a83b973ed45c46cb17dcb395fa42276e1 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 3 Aug 2012 01:57:09 +0200 Subject: [PATCH 31/73] preferences: Minimal setup for preferences dialog. --- bin/qasim-gui.rb | 8 ++++++-- lib/qasim/ui.rb | 3 ++- lib/qasim/ui/preferences.rb | 12 ++++++++++++ lib/qasim/ui/preferences.ui | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 lib/qasim/ui/preferences.rb diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index 3c41814..4b5cb32 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -154,13 +154,16 @@ module Qasim act_pref = Qt::Action.new _('&Preferences'), @context_menu act_pref.setIcon( Qt::Icon::fromTheme("configure") ) rescue nil act_pref.setIconVisibleInMenu true - act_pref.setEnabled false + #act_pref.setEnabled true + act_pref.connect(SIGNAL(:triggered)) do + res = @pref_dialog.show + end @context_menu.addAction act_pref; act_about = Qt::Action.new '&About', @context_menu act_about.setIcon( Qt::Icon::fromTheme("help-about") ) rescue nil act_about.setIconVisibleInMenu true - act_about.setEnabled true + #act_about.setEnabled true act_about.connect(SIGNAL(:triggered)) do res = @about_dialog.show end @@ -189,6 +192,7 @@ module Qasim @main_win = Qt::MainWindow.new @systray = Qt::SystemTrayIcon.new @main_win @about_dialog = Qasim::Ui::About.new @main_win + @pref_dialog = Qasim::Ui::Preferences.new @main_win std_icon = Qt::Icon.new( ":/qasim/qasim-icon" ) alt_icon = Qt::Icon.new diff --git a/lib/qasim/ui.rb b/lib/qasim/ui.rb index e0e110e..b431223 100644 --- a/lib/qasim/ui.rb +++ b/lib/qasim/ui.rb @@ -2,5 +2,6 @@ require 'qasim/constants' module Qasim ; module Ui - autoload :About, 'qasim/ui/about' + autoload :About, 'qasim/ui/about' + autoload :Preferences, 'qasim/ui/preferences' end ; end diff --git a/lib/qasim/ui/preferences.rb b/lib/qasim/ui/preferences.rb new file mode 100644 index 0000000..46e075a --- /dev/null +++ b/lib/qasim/ui/preferences.rb @@ -0,0 +1,12 @@ + +require 'qasim/ui/preferences_ui' + +module Qasim ; module Ui + class Preferences < Qt::Dialog + def initialize(parent = nil) + super + @ui = Ui_Preferences.new + @ui.setup_ui(self) + end + end +end ; end diff --git a/lib/qasim/ui/preferences.ui b/lib/qasim/ui/preferences.ui index a0c10f3..38dd421 100644 --- a/lib/qasim/ui/preferences.ui +++ b/lib/qasim/ui/preferences.ui @@ -1,6 +1,6 @@ - MapDialog + Preferences From c73c3b4af17321b677a9b649a311aaaebcc082ac Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 3 Aug 2012 18:16:49 +0200 Subject: [PATCH 32/73] ui: Changed window icons. --- lib/qasim/ui/about.ui | 4 ++++ lib/qasim/ui/preferences.ui | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/qasim/ui/about.ui b/lib/qasim/ui/about.ui index 11b629e..bc1ab59 100644 --- a/lib/qasim/ui/about.ui +++ b/lib/qasim/ui/about.ui @@ -13,6 +13,10 @@ About + + + :/qasim/qasim-icon:/qasim/qasim-icon + true diff --git a/lib/qasim/ui/preferences.ui b/lib/qasim/ui/preferences.ui index 38dd421..1d6360d 100644 --- a/lib/qasim/ui/preferences.ui +++ b/lib/qasim/ui/preferences.ui @@ -13,6 +13,10 @@ Preferences + + + :/qasim/qasim-icon:/qasim/qasim-icon + From dd48b959f4a0adabcdbb23d118e24d1d8301ba72 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 3 Aug 2012 18:17:05 +0200 Subject: [PATCH 33/73] ui/preferences: Changed class name MapDialog -> Preferences. --- lib/qasim/ui/preferences.ui | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/qasim/ui/preferences.ui b/lib/qasim/ui/preferences.ui index 1d6360d..f1fd18e 100644 --- a/lib/qasim/ui/preferences.ui +++ b/lib/qasim/ui/preferences.ui @@ -1,7 +1,7 @@ Preferences - + 0 @@ -50,12 +50,14 @@ - + + + buttonBox accepted() - MapDialog + Preferences accept() @@ -71,7 +73,7 @@ buttonBox rejected() - MapDialog + Preferences reject() From 54ea191dc9750d61515afbd3e678962317bbf373 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 3 Aug 2012 18:24:05 +0200 Subject: [PATCH 34/73] Makefile: fix installation rules for icons & ui library. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dba048e..75a40a3 100644 --- a/Makefile +++ b/Makefile @@ -121,7 +121,7 @@ clean-lib: build-lib: install-lib: - for libfile in lib/*.rb lib/**/*.rb ; do \ + IFS="" find lib -name '*.rb' | while read libfile ; do \ install -D -o root -g root -m 644 $$libfile $(SHAREDIR)/$(NAME)/$$libfile; \ done @@ -139,7 +139,7 @@ install-data: # ## Install icons mkdir -p $(SHAREDIR)/$(NAME)/icons - install -D -o root -g root -m 644 $(CURDIR)/icons/$(NAME).svg \ + install -D -o root -g root -m 644 $(CURDIR)/data/icons/$(NAME).svg \ $(SHAREDIR)/$(NAME)/icons/$(NAME).svg # ## Install completion file From effe74f2998ce4ab1e4100f5cb3ff3852790d048 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 3 Dec 2012 07:07:05 -0800 Subject: [PATCH 35/73] Updated README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 6f8e240..4d5e229 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,11 @@ or apt-get install ruby-qt4 +Alternatives +------------ + +* [Mountoid](http://kde-apps.org/content/show.php/Mountoid?content=115943) + Copyright & License ------------------- From 2f1c58fa67c28afbb345014d5138c745c38fed4e Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 21 Jun 2013 14:24:40 +0200 Subject: [PATCH 36/73] Update Gemfile to include qtbindings. --- Gemfile | 3 ++- Gemfile.lock | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index f623263..d85ade9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ -source :rubygems +source "https://rubygems.org" gem "rdebug" +gem "qtbindings" diff --git a/Gemfile.lock b/Gemfile.lock index 4c9f069..975df05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,12 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: + qtbindings (4.8.3.0) rdebug (0.1) PLATFORMS ruby DEPENDENCIES + qtbindings rdebug From f8e4fc57bd51c83f8c9dc4c3f22c6600e03a2148 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 21 Jun 2013 14:25:03 +0200 Subject: [PATCH 37/73] Fix installation for devs. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 75a40a3..b9e2817 100644 --- a/Makefile +++ b/Makefile @@ -109,8 +109,8 @@ install-bin: for binfile in bin/*.rb ; do \ BINFILE=`basename $$binfile |sed -e 's/.rb$$//'`; \ install -D -o root -g root -m 755 $$binfile $(BINDIR)/$$BINFILE; \ - sed -i -e 's|^QASIM_INCLUDE_DIR.*|QASIM_INCLUDE_DIR = "/usr/share/$(NAME)/lib"|' $(BINDIR)/$$BINFILE; \ - sed -i -e 's|^QASIM_DATA_DIR.*|QASIM_DATA_DIR = "/usr/share/$(NAME)"|' $(BINDIR)/$$BINFILE; \ + sed -i -e 's|^QASIM_INCLUDE_DIR.*|QASIM_INCLUDE_DIR = "$(SHAREDIR)/$(NAME)/lib"|' $(BINDIR)/$$BINFILE; \ + sed -i -e 's|^QASIM_DATA_DIR.*|QASIM_DATA_DIR = "$(SHAREDIR)/$(NAME)"|' $(BINDIR)/$$BINFILE; \ done #install -D -o root -g root -m 755 $(CURDIR)/bin/$(NAME)-gui.rb $(BINDIR)/$(NAME)-gui @@ -166,8 +166,8 @@ install-data: ## OTHER -.PHONY: destdir -destdir: - rm -fr destdir - fakeroot $(MAKE) install DESTDIR=destdir +.PHONY: tmp/destdir +dev-install: + rm -fr tmp/destdir + fakeroot $(MAKE) install DESTDIR=tmp/destdir From 4d6219603fc40d524756d7332ec853352d35c5b4 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 13 Aug 2013 12:58:31 +0200 Subject: [PATCH 38/73] Added todolist. --- TODO.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 TODO.md diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..424a14a --- /dev/null +++ b/TODO.md @@ -0,0 +1,23 @@ +Global Qasim parameters + +* Default local cache directory +* Default mount point directory + +* AutoSSH (disable if not installed) + * autossh executable path + * use autossh (default: yes) +* Unison (disable if not installed) + * unison executable path + * use unison (default: yes) + * sync interval (0=none, ...) in hours + +Global SSHFS Options + +* reconnect (default: yes) +* compress (default: yes) +* transform_symlinks (default: yes) +* ServerAliveInterval (default: 30) +* ServerAliveCountMax (default: 30) + +ssh_command='autossh -M 0' + From 037cbb022f7094ecba84023e8e452275b942aa40 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 13 Aug 2013 12:58:51 +0200 Subject: [PATCH 39/73] gitignore: ignore bundle files. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b9efdf8..1bcca91 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ destdir/ debian/qasim/ *_ui.rb *_qrc.rb +.bundle +vendor/bundle From 5041002f5e324cb62c6a8da6d3d96e17f212ae41 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 18 Oct 2013 19:11:48 +0200 Subject: [PATCH 40/73] Add thor to Gemfile. --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index d85ade9..ff57b62 100644 --- a/Gemfile +++ b/Gemfile @@ -3,3 +3,4 @@ source "https://rubygems.org" gem "rdebug" gem "qtbindings" +gem "thor" diff --git a/Gemfile.lock b/Gemfile.lock index 975df05..f6bb6cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,6 +3,7 @@ GEM specs: qtbindings (4.8.3.0) rdebug (0.1) + thor (0.18.1) PLATFORMS ruby @@ -10,3 +11,4 @@ PLATFORMS DEPENDENCIES qtbindings rdebug + thor From 9c0155ed30808992efde55c108bc2a5a8cbb7e07 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 24 Oct 2013 16:27:02 +0200 Subject: [PATCH 41/73] Improve documentation. --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4d5e229..e4fdaf1 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,14 @@ README Requirements ------------ +First, make sure your ruby was compiled with the --enable-shared options. +If not, reinstall it (let's say version 1.9.3-p392) with with : + + CONFIGURE_OPTS="--enable-shared" rbenv install 1.9.3-p392 + Install the following gems - - * qtbindings + qtbindings Those could also be provided by your linux distribution and installable with From b77074e3a5625b3669874edfbca6d2597d86b37d Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sun, 23 Feb 2014 22:18:12 +0100 Subject: [PATCH 42/73] Use bundler. --- bin/qasim-gui.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index 4b5cb32..a85a470 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby -require 'rubygems' +#require 'rubygems' +require 'bundler/setup' require 'Qt4' $DEBUG = true From 774930c4a5cde44924439f679d4372abfb8d3675 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sun, 23 Feb 2014 22:18:26 +0100 Subject: [PATCH 43/73] Prepare the CLI for the evolution. --- bin/qasim-cli.rb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/bin/qasim-cli.rb b/bin/qasim-cli.rb index 64e10c6..606e37b 100755 --- a/bin/qasim-cli.rb +++ b/bin/qasim-cli.rb @@ -3,9 +3,23 @@ $DEBUG = true $VERBOSE = true +QASIM_INCLUDE_DIR = "lib" +QASIM_DATA_DIR = "." + +$:.push QASIM_INCLUDE_DIR +p $:.inspect + +# +# external libraries +# +require 'bundler/setup' require 'pp' -require 'qasim/config' -require 'qasim/map' +#require 'thor' + +# +# project libraries +# +require 'qasim' module Qasim From febe5550c06bd3fd1ef5ea15d840f002bb3b59bd Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 20 Mar 2014 22:48:53 +0100 Subject: [PATCH 44/73] Use library entry point. --- bin/qasim-cli.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/qasim-cli.rb b/bin/qasim-cli.rb index 64e10c6..1cfcbfe 100755 --- a/bin/qasim-cli.rb +++ b/bin/qasim-cli.rb @@ -4,8 +4,7 @@ $DEBUG = true $VERBOSE = true require 'pp' -require 'qasim/config' -require 'qasim/map' +require 'qasim' module Qasim From 1f19a0b0db54cc22a6864a6f80a76d90bdd5cc6b Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 31 Mar 2014 01:22:37 +0200 Subject: [PATCH 45/73] Remove bundler call from file. --- bin/qasim-gui.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index a85a470..917a9c0 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby #require 'rubygems' -require 'bundler/setup' +#require 'bundler/setup' require 'Qt4' $DEBUG = true From 30d8aead962d4b089bbe04edb4cf7f8e55632685 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 31 Mar 2014 09:25:32 +0200 Subject: [PATCH 46/73] Use rbuic4 through bundler. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b9e2817..5a27935 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ install-ui: $(RBUI_FILES) # FIXME install %_ui.rb: %.ui - rbuic4 $< -o $@ + bundle exec rbuic4 $< -o $@ sed -e '/^module Ui/,/^end # module Ui/d' \ -i $@ From 222396e3a5097d07b1aea4fe4ec7e429335d161b Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 3 Apr 2014 00:57:55 +0200 Subject: [PATCH 47/73] Add more sections (fork, contributing, etc.) --- README.md | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e4fdaf1..b95639e 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,36 @@ or apt-get install ruby-qt4 -Alternatives +Installation ------------ -* [Mountoid](http://kde-apps.org/content/show.php/Mountoid?content=115943) +Add this line to your application's Gemfile: + + gem 'qasim' + +And then execute: + + $ bundle + +Or install it yourself as: + + $ gem install qasim + + +Usage +----- + +TODO: Write usage instructions here + + +Contributing +------------ + +1. Fork it ( http://github.com/glenux/qasim/fork ) +2. Create your feature branch (`git checkout -b my-new-feature`) +3. Commit your changes (`git commit -am 'Add some feature'`) +4. Push to the branch (`git push origin my-new-feature`) +5. Create new Pull Request Copyright & License @@ -47,3 +73,9 @@ 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 . + +Alternatives +------------ + +* [Mountoid](http://kde-apps.org/content/show.php/Mountoid?content=115943) + From 63f19861d5402ed733f89162f27c9b068d41e859 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 3 Apr 2014 01:09:53 +0200 Subject: [PATCH 48/73] Added various files (gemspec, Rakefile, etc.) for Gem. --- .gitignore | 17 +++++++++++++++++ Gemfile | 10 ++++++---- Rakefile | 1 + lib/qasim.rb | 1 + lib/qasim/constants.rb | 3 --- lib/qasim/version.rb | 5 +++++ qasim.gemspec | 25 +++++++++++++++++++++++++ 7 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 Rakefile create mode 100644 lib/qasim/version.rb create mode 100644 qasim.gemspec diff --git a/.gitignore b/.gitignore index 1bcca91..54b41ec 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,20 @@ debian/qasim/ *_qrc.rb .bundle vendor/bundle +*.gem +*.rbc +.bundle +.config +.yardoc +Gemfile.lock +InstalledFiles +_yardoc +coverage +doc/ +lib/bundler/man +pkg +rdoc +spec/reports +test/tmp +test/version_tmp +tmp diff --git a/Gemfile b/Gemfile index ff57b62..11ee8a0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ +source 'https://rubygems.org' -source "https://rubygems.org" +# Specify your gem's dependencies in qasim.gemspec +gemspec -gem "rdebug" -gem "qtbindings" -gem "thor" +#gem "rdebug" +#gem "qtbindings" +#gem "thor" diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..2995527 --- /dev/null +++ b/Rakefile @@ -0,0 +1 @@ +require "bundler/gem_tasks" diff --git a/lib/qasim.rb b/lib/qasim.rb index 877a907..1c141d4 100644 --- a/lib/qasim.rb +++ b/lib/qasim.rb @@ -1,5 +1,6 @@ +require 'qasim/version' require 'qasim/constants' module Qasim diff --git a/lib/qasim/constants.rb b/lib/qasim/constants.rb index 22ab788..9d84e64 100644 --- a/lib/qasim/constants.rb +++ b/lib/qasim/constants.rb @@ -1,8 +1,5 @@ module Qasim APP_ICON_PATH = File.join QASIM_DATA_DIR, "icons" - APP_NAME = "Qasim" - APP_VERSION = "0.1" - APP_DATE = "2012-08-02" APP_SYSCONFIG_DIR = "/etc/qasim/maps.d" diff --git a/lib/qasim/version.rb b/lib/qasim/version.rb new file mode 100644 index 0000000..169b85c --- /dev/null +++ b/lib/qasim/version.rb @@ -0,0 +1,5 @@ +module Qasim + APP_NAME = "Qasim" + APP_VERSION = "0.1" + APP_DATE = "2012-08-02" +end diff --git a/qasim.gemspec b/qasim.gemspec new file mode 100644 index 0000000..5a9e4c9 --- /dev/null +++ b/qasim.gemspec @@ -0,0 +1,25 @@ +# coding: utf-8 +lib = File.expand_path('../lib', __FILE__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require 'qasim/version' + +Gem::Specification.new do |spec| + spec.name = "qasim" + spec.version = Qasim::APP_VERSION + spec.authors = ["Glenn Y. Rolland"] + spec.email = ["glenux@glenux.net"] + spec.summary = %q{Easy mount solution for SSH filesystems.} + spec.description = %q{Qasim is a front-end for sshfs, the filesystem + client based on fuse and ssh. It provides automating and global settings + control for sshfs mounts.} + spec.homepage = "" + spec.license = "GPL-3" + + spec.files = `git ls-files`.split($/) + spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } + spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) + spec.require_paths = ["lib"] + + spec.add_development_dependency "bundler", "~> 1.5" + spec.add_development_dependency "rake" +end From dd1a1d08a0dc741ada3193d41ec8a2a0a7256f5a Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 3 Apr 2014 01:14:02 +0200 Subject: [PATCH 49/73] Update URL where needed. --- debian/copyright | 8 +++----- qasim.gemspec | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/copyright b/debian/copyright index 92fb2f3..7d4f5c6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,17 +1,15 @@ This package was debianized by Glenn ROLLAND on Sat, 15 Mar 2008 17:11:00 +0100. -It was downloaded from +It was downloaded from http://glenux.github.io/qasim Upstream Author(s): - - + Glenn Y. Rolland Copyright: - - + Copyright (C) 2008-2014 Glenn Y. Rolland License: diff --git a/qasim.gemspec b/qasim.gemspec index 5a9e4c9..02428c9 100644 --- a/qasim.gemspec +++ b/qasim.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |spec| spec.description = %q{Qasim is a front-end for sshfs, the filesystem client based on fuse and ssh. It provides automating and global settings control for sshfs mounts.} - spec.homepage = "" + spec.homepage = "http://glenux.github.io/qasim" spec.license = "GPL-3" spec.files = `git ls-files`.split($/) From a700adb2400b9792b82a2237a287f708c782fc33 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 3 Apr 2014 01:29:49 +0200 Subject: [PATCH 50/73] Add reference to TODO. --- TODO.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/TODO.md b/TODO.md index 424a14a..a505b0d 100644 --- a/TODO.md +++ b/TODO.md @@ -21,3 +21,8 @@ Global SSHFS Options ssh_command='autossh -M 0' + +Fixes + +Use Rakefile +ex: https://github.com/ryanmelt/qtbindings/blob/master/Rakefile From 3d140f2402a48d3d8a56d20b796e141d2c9e34a1 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 3 Apr 2014 07:57:29 +0200 Subject: [PATCH 51/73] Disable preferences. --- bin/qasim-gui.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index 917a9c0..a3925c5 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -155,7 +155,7 @@ module Qasim act_pref = Qt::Action.new _('&Preferences'), @context_menu act_pref.setIcon( Qt::Icon::fromTheme("configure") ) rescue nil act_pref.setIconVisibleInMenu true - #act_pref.setEnabled true + act_pref.setEnabled false act_pref.connect(SIGNAL(:triggered)) do res = @pref_dialog.show end From 6c45972cae53777294c9bc8eb415140a202830b5 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 4 Apr 2014 00:36:18 +0200 Subject: [PATCH 52/73] Update Gemfile & Makefile. --- Gemfile | 2 ++ Makefile | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ff57b62..9ce12cd 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,7 @@ source "https://rubygems.org" gem "rdebug" +#gem "qtbindings", "~> 4.8.3.0" gem "qtbindings" gem "thor" + diff --git a/Makefile b/Makefile index 5a27935..e1d8764 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ NAME=qasim +DESTDIR=/usr/local +DEV_DESTDIR=tmp CONFDIR=$(DESTDIR)/etc BINDIR=$(DESTDIR)/usr/bin MANDIR=$(DESTDIR)/usr/share/man @@ -166,8 +168,8 @@ install-data: ## OTHER -.PHONY: tmp/destdir +.PHONY: destdir dev-install: - rm -fr tmp/destdir - fakeroot $(MAKE) install DESTDIR=tmp/destdir + rm -fr $(DEV_DESTDIR) + fakeroot $(MAKE) install DESTDIR=$(DEV_DESTDIR) From 348e7a2b90b9c7e525387f8ab9482f3a79a46c5d Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 9 May 2014 07:50:42 +0200 Subject: [PATCH 53/73] Ignore ruby version. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 54b41ec..6226710 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ vendor/bundle .bundle .config .yardoc +.ruby-version Gemfile.lock InstalledFiles _yardoc From d52a0011bfb1c66ec74d1850060b15b0314fa2ba Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 9 May 2014 07:55:08 +0200 Subject: [PATCH 54/73] Update debian package properties. --- debian/changelog | 13 +++++++++++++ debian/control | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cd078f7..cb2c1a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +qasim (0.1.10) unstable; urgency=medium + + * qasim-gui: update project dependencies upon ruby & gems. + * Added base files for Gem packaging & distribution. + * Makefile: fix installation rules for icons & ui library. + * ui/preferences: Changed class name MapDialog -> Preferences. + * ui: Changed window icons. + * Added base for preferences dialog. + * Added about dialog. + * data: Move all UI text as resource files. + + -- Glenn Y. Rolland Fri, 09 May 2014 07:31:16 +0200 + qasim (0.1.9) unstable; urgency=low * qasim-gui: Use /proc/ instead of kill to detect other processes. diff --git a/debian/control b/debian/control index ef4210b..bf1a68a 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: qasim Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby, libqt4-ruby, rubygems +Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby2.0, libqt4-ruby, rubygems Description: Easy mount solution for SSH filesystems. Qasim is a front-end for sshfs, the filesystem client based on fuse and ssh. It provides automating and global settings control for sshfs mounts. From c700c44bbb2d038adbc05b880b31de2abb51513b Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 9 May 2014 08:20:37 +0200 Subject: [PATCH 55/73] Bump version. --- lib/qasim/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/qasim/version.rb b/lib/qasim/version.rb index 169b85c..b39b9fb 100644 --- a/lib/qasim/version.rb +++ b/lib/qasim/version.rb @@ -1,5 +1,5 @@ module Qasim APP_NAME = "Qasim" - APP_VERSION = "0.1" - APP_DATE = "2012-08-02" + APP_VERSION = "0.1.10" + APP_DATE = "2014-05-09" end From ba87b74331d963eb1725c06a3cd2350f07304ceb Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 9 May 2014 08:22:24 +0200 Subject: [PATCH 56/73] Remove call of bundle. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1d8764..3974c55 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ install-ui: $(RBUI_FILES) # FIXME install %_ui.rb: %.ui - bundle exec rbuic4 $< -o $@ + rbuic4 $< -o $@ sed -e '/^module Ui/,/^end # module Ui/d' \ -i $@ From 9dfbee668d0df2d4bcf32ddf1ed0fb74ebd5ea52 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 9 May 2014 08:35:40 +0200 Subject: [PATCH 57/73] Tmp changes. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3974c55..3c5a6a4 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,12 @@ NAME=qasim DESTDIR=/usr/local DEV_DESTDIR=tmp CONFDIR=$(DESTDIR)/etc -BINDIR=$(DESTDIR)/usr/bin -MANDIR=$(DESTDIR)/usr/share/man -DOCDIR=$(DESTDIR)/usr/share/doc -SHAREDIR=$(DESTDIR)/usr/share +BINDIR=$(DESTDIR)/bin +MANDIR=$(DESTDIR)/share/man +DOCDIR=$(DESTDIR)/share/doc +SHAREDIR=$(DESTDIR)/share -RUBYVERSION=1.8 +RUBYVERSION=2.0 RDOC=rdoc$(RUBYVERSION) all: \ @@ -107,6 +107,7 @@ clean-bin: build-bin: install-bin: + set mkdir -p $(BINDIR) for binfile in bin/*.rb ; do \ BINFILE=`basename $$binfile |sed -e 's/.rb$$//'`; \ From 554566674f1b2ec326483bfe026bf3e4dcc7d02b Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 19 May 2014 09:39:30 +0200 Subject: [PATCH 58/73] Add debian source. --- debian/source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/source/format diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 From 11c5632c21d3c0fbf04e1d47d2390d8801faf005 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 19 May 2014 09:51:12 +0200 Subject: [PATCH 59/73] Change DESTDIR in makefile. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3c5a6a4..f789efe 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ NAME=qasim -DESTDIR=/usr/local +DESTDIR= DEV_DESTDIR=tmp CONFDIR=$(DESTDIR)/etc -BINDIR=$(DESTDIR)/bin -MANDIR=$(DESTDIR)/share/man -DOCDIR=$(DESTDIR)/share/doc -SHAREDIR=$(DESTDIR)/share +BINDIR=$(DESTDIR)/usr/bin +MANDIR=$(DESTDIR)/usr/share/man +DOCDIR=$(DESTDIR)/usr/share/doc +SHAREDIR=$(DESTDIR)/usr/share RUBYVERSION=2.0 RDOC=rdoc$(RUBYVERSION) @@ -107,7 +107,7 @@ clean-bin: build-bin: install-bin: - set + env |sort mkdir -p $(BINDIR) for binfile in bin/*.rb ; do \ BINFILE=`basename $$binfile |sed -e 's/.rb$$//'`; \ From 3eef8842e40e3f9eca18d944ecec084638c3decc Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 16 Jun 2014 09:21:36 +0200 Subject: [PATCH 60/73] Use pathname for load DIR. --- bin/qasim-gui.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index a3925c5..74fc843 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -10,9 +10,10 @@ $VERBOSE = true require 'pp' require 'set' require 'fcntl' +require 'pathname' -QASIM_INCLUDE_DIR = "lib" -QASIM_DATA_DIR = "." +QASIM_INCLUDE_DIR = Pathname.new(File.dirname(__FILE__)).parent + "lib" +QASIM_DATA_DIR = Pathname.new(File.dirname(__FILE__)).parent $:.push QASIM_INCLUDE_DIR From 6fe78fea3d37439ded22c8db21451baeab3917e7 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 12 Aug 2014 00:19:19 +0200 Subject: [PATCH 61/73] Remove shebang from non-executable files. --- lib/qasim/config.rb | 2 -- lib/qasim/configold.rb | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/qasim/config.rb b/lib/qasim/config.rb index 0162c06..d69a12d 100644 --- a/lib/qasim/config.rb +++ b/lib/qasim/config.rb @@ -1,5 +1,3 @@ -#!/usr/bin/ruby -# vim: set ts=4 sw=4: require 'optparse' require 'ostruct' diff --git a/lib/qasim/configold.rb b/lib/qasim/configold.rb index dfdde22..bb09ec2 100644 --- a/lib/qasim/configold.rb +++ b/lib/qasim/configold.rb @@ -1,5 +1,3 @@ -#!/usr/bin/ruby -# vim: set ts=4 sw=4: require 'optparse' require 'ostruct' From 9dec4fc95a6d2310f9545a52730345bd6b2ea3ac Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 12 Aug 2014 00:24:19 +0200 Subject: [PATCH 62/73] Fix duplicate entry in .desktop file. --- conf/qasim.desktop | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/qasim.desktop b/conf/qasim.desktop index b2d5e69..c938a66 100644 --- a/conf/qasim.desktop +++ b/conf/qasim.desktop @@ -9,6 +9,5 @@ Type=Application Icon=printer NotShowIn= X-Desktop-File-Install-Version=0.15 -Categories=KDE;GTK;Monitor;System; StartupNotify=true -Categories=KDE;Qt;Network;System;Utility; +Categories=KDE;Qt;GTK;Network;System;Utility; From 230c8509fa2f7a862ae12db990bacd47ddc0c5e7 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 12 Aug 2014 00:25:20 +0200 Subject: [PATCH 63/73] Fix debian/rules. --- debian/rules | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/debian/rules b/debian/rules index 4befa4e..55818a2 100755 --- a/debian/rules +++ b/debian/rules @@ -7,38 +7,29 @@ # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - - +export DH_VERBOSE=1 configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. - touch configure-stamp - build: build-stamp build-stamp: configure-stamp dh_testdir - # Add here commands to compile the package. - $(MAKE) + $(MAKE) DESTDIR=$(CURDIR)/debian/qasim build #docbook-to-man debian/qasim.sgml > qasim.1 - touch $@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. $(MAKE) clean - dh_clean install: build @@ -46,7 +37,6 @@ install: build dh_testroot dh_clean -k dh_installdirs - # Add here commands to install the package into debian/qasim. $(MAKE) DESTDIR=$(CURDIR)/debian/qasim install From daaa345dd4adc572e4b7a6778195e837c8f1d0e6 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 12 Aug 2014 00:25:37 +0200 Subject: [PATCH 64/73] Add dependency upon ruby instead of ruby2.0 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index bf1a68a..ef4210b 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: qasim Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby2.0, libqt4-ruby, rubygems +Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby, libqt4-ruby, rubygems Description: Easy mount solution for SSH filesystems. Qasim is a front-end for sshfs, the filesystem client based on fuse and ssh. It provides automating and global settings control for sshfs mounts. From 29b3f30581461d2760f969b353c6df9576da9e7b Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 12 Aug 2014 08:42:55 +0200 Subject: [PATCH 65/73] Update dependencies. --- Gemfile.lock | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f6bb6cf..7d84340 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,17 @@ +PATH + remote: . + specs: + qasim (0.1.10) + GEM remote: https://rubygems.org/ specs: - qtbindings (4.8.3.0) - rdebug (0.1) - thor (0.18.1) + rake (10.3.2) PLATFORMS ruby DEPENDENCIES - qtbindings - rdebug - thor + bundler (~> 1.5) + qasim! + rake From 8bd7a473e896129cc06626124c0d6b9abb245caa Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 12 Aug 2014 08:46:56 +0200 Subject: [PATCH 66/73] Add manpage placeholders. --- qasim-cli.1 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ qasim-gui.1 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 qasim-cli.1 create mode 100644 qasim-gui.1 diff --git a/qasim-cli.1 b/qasim-cli.1 new file mode 100644 index 0000000..3c55799 --- /dev/null +++ b/qasim-cli.1 @@ -0,0 +1,98 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH QASIM-CLI 1 "august 12, 2014" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) + + +.SH NAME + +sshfs-mapper \- A small utility for automatizing sshfs mounts. + + +.SH SYNOPSIS + +.B sshfs-mapper +.RI [ options ] + + +.SH DESCRIPTION +This manual page documents briefly the +.B sshfs-mapper +command. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBsshfs-mapper\fP is a program that... + + + +.SH OPTIONS + +.TP +.B \-h\fP, \fB--help +Show summary of options. +.TP +.B \-i\fP, \fB--init +Initialize sshfs-mapper configuration. +.TP +.B \-l\fP, \fB--list +List available maps. +.TP +.B \-a\fP, \fB--all +Select all maps. +.TP +.B \-s\fP, \fB--select \fImap\fP +Only use specified map. +.TP +.B \-u\fP, \fB--umount +Umount maps (mount if the flag is not specified). +.TP +.B \-v\fP, \fB--verbose +Show version of program. + + +.SH FILES + +.TP +$XDG_CONFIG_HOME/sshfs-mapper/config + +Global settings file. + +.TP +$XDG_CONFIG_HOME/sshfs-mapper/*.map + +Per-host configuration and mappings. + + +.SH CONFIGURATION + +Configuration file is stored inside $XDG_CONFIG_HOME/sshfs-mapper/ . +Global settings are storend in the \fBconfig\fP file a FIXME + +.SH SEE ALSO + +.BR sshfs (1), +.BR ssh (1), +.BR ssh-keygen (1). + + +.SH AUTHOR + +sshfs-mapper was written by Glenn.Rolland . +.PP +This manual page was written by Glenn ROLLAND , +for the Debian project (but may be used by others). diff --git a/qasim-gui.1 b/qasim-gui.1 new file mode 100644 index 0000000..024864f --- /dev/null +++ b/qasim-gui.1 @@ -0,0 +1,98 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH QASIM-GUI 1 "august 12, 2014" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) + + +.SH NAME + +qasim-gui \- A small utility for automatizing sshfs mounts - GUI version + + +.SH SYNOPSIS + +.B qasim-gui +.RI [ options ] + + +.SH DESCRIPTION +This manual page documents briefly the +.B sshfs-mapper +command. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBsshfs-mapper\fP is a program that... + + + +.SH OPTIONS + +.TP +.B \-h\fP, \fB--help +Show summary of options. +.TP +.B \-i\fP, \fB--init +Initialize sshfs-mapper configuration. +.TP +.B \-l\fP, \fB--list +List available maps. +.TP +.B \-a\fP, \fB--all +Select all maps. +.TP +.B \-s\fP, \fB--select \fImap\fP +Only use specified map. +.TP +.B \-u\fP, \fB--umount +Umount maps (mount if the flag is not specified). +.TP +.B \-v\fP, \fB--verbose +Show version of program. + + +.SH FILES + +.TP +$XDG_CONFIG_HOME/sshfs-mapper/config + +Global settings file. + +.TP +$XDG_CONFIG_HOME/sshfs-mapper/*.map + +Per-host configuration and mappings. + + +.SH CONFIGURATION + +Configuration file is stored inside $XDG_CONFIG_HOME/sshfs-mapper/ . +Global settings are storend in the \fBconfig\fP file a FIXME + +.SH SEE ALSO + +.BR sshfs (1), +.BR ssh (1), +.BR ssh-keygen (1). + + +.SH AUTHOR + +sshfs-mapper was written by Glenn.Rolland . +.PP +This manual page was written by Glenn ROLLAND , +for the Debian project (but may be used by others). From 3caac05977d52307e7a3589225f3ffe6c7b1441c Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 12 Aug 2014 09:22:51 +0200 Subject: [PATCH 67/73] Add support for man pages & clean vendor dir. --- Makefile | 10 +++++++--- qasim-cli.1 => man/qasim-cli.1 | 0 qasim-gui.1 => man/qasim-gui.1 | 0 sshfs-mapper.1 => man/sshfs-mapper.1 | 0 4 files changed, 7 insertions(+), 3 deletions(-) rename qasim-cli.1 => man/qasim-cli.1 (100%) rename qasim-gui.1 => man/qasim-gui.1 (100%) rename sshfs-mapper.1 => man/sshfs-mapper.1 (100%) diff --git a/Makefile b/Makefile index f789efe..3c4482b 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,8 @@ install-ui: $(RBUI_FILES) ## BINARY SECTION clean-bin: - # make no sense in ruby + # remove external packages + rm -fr vendor/bundle build-bin: @@ -137,8 +138,11 @@ build-data: install-data: ## Install man pages - # mkdir -p $(MANDIR)/man1 - # cat $(NAME).1 | gzip > $(MANDIR)/man1/$(NAME).1.gz + mkdir -p $(MANDIR)/man1 + for binfile in bin/*.rb ; do \ + BINFILE=`basename $$binfile |sed -e 's/.rb$$//'`; \ + cat man/$${BINFILE}.1 | gzip > $(MANDIR)/man1/$${BINFILE}.1.gz ; \ + done # ## Install icons mkdir -p $(SHAREDIR)/$(NAME)/icons diff --git a/qasim-cli.1 b/man/qasim-cli.1 similarity index 100% rename from qasim-cli.1 rename to man/qasim-cli.1 diff --git a/qasim-gui.1 b/man/qasim-gui.1 similarity index 100% rename from qasim-gui.1 rename to man/qasim-gui.1 diff --git a/sshfs-mapper.1 b/man/sshfs-mapper.1 similarity index 100% rename from sshfs-mapper.1 rename to man/sshfs-mapper.1 From 0402a2c475612af1588303091f44fd3785381c81 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Sun, 26 Oct 2014 11:31:31 +0100 Subject: [PATCH 68/73] Rename bin. --- bin/{qasim-cli.rb => qasim-cli} | 0 bin/{qasim-gui.rb => qasim-gui} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename bin/{qasim-cli.rb => qasim-cli} (100%) rename bin/{qasim-gui.rb => qasim-gui} (100%) diff --git a/bin/qasim-cli.rb b/bin/qasim-cli similarity index 100% rename from bin/qasim-cli.rb rename to bin/qasim-cli diff --git a/bin/qasim-gui.rb b/bin/qasim-gui similarity index 100% rename from bin/qasim-gui.rb rename to bin/qasim-gui From b1c7a5ed13f08ea823cbb26f689c4bc338e7c07a Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 27 Oct 2014 21:03:18 +0100 Subject: [PATCH 69/73] Add qtbindings dependency. --- Gemfile.lock | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 7d84340..f14e312 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,10 +2,12 @@ PATH remote: . specs: qasim (0.1.10) + qtbindings (~> 4.8.6.0) GEM remote: https://rubygems.org/ specs: + qtbindings (4.8.6.0) rake (10.3.2) PLATFORMS From 1724b509a1c48390bff1af2dd5f6fd54462ca294 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 27 Oct 2014 21:04:09 +0100 Subject: [PATCH 70/73] Fix obsolete function call. --- lib/qasim/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qasim/config.rb b/lib/qasim/config.rb index d69a12d..451c2c8 100644 --- a/lib/qasim/config.rb +++ b/lib/qasim/config.rb @@ -34,7 +34,7 @@ module Qasim @maps = [] map_dirs = [@config_dir, APP_SYSCONFIG_DIR].select{ |d| - File.exists? d and File.directory? d + File.exist? d and File.directory? d } Find.find( *map_dirs ) do |path| if File.file? path From e84aebceb9cb44d56fa20adc7835a8a49154bfac Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 27 Oct 2014 21:04:36 +0100 Subject: [PATCH 71/73] Add qtbindings dependency. --- qasim.gemspec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qasim.gemspec b/qasim.gemspec index 02428c9..bb8a7bd 100644 --- a/qasim.gemspec +++ b/qasim.gemspec @@ -16,10 +16,15 @@ Gem::Specification.new do |spec| spec.license = "GPL-3" spec.files = `git ls-files`.split($/) + .concat(Dir['*/**/*_ui.rb']) + .concat(Dir['*/**/*_qrc.rb']) + spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "rake" + + spec.add_runtime_dependency "qtbindings", "~> 4.8.6.0" end From f833fa9410808834f6674802d23ee526cb3b5555 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 27 Oct 2014 21:04:49 +0100 Subject: [PATCH 72/73] Fix data path. --- bin/qasim-gui | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bin/qasim-gui b/bin/qasim-gui index 74fc843..4fe9eb1 100755 --- a/bin/qasim-gui +++ b/bin/qasim-gui @@ -1,7 +1,5 @@ #!/usr/bin/env ruby -#require 'rubygems' -#require 'bundler/setup' require 'Qt4' $DEBUG = true @@ -13,12 +11,11 @@ require 'fcntl' require 'pathname' QASIM_INCLUDE_DIR = Pathname.new(File.dirname(__FILE__)).parent + "lib" -QASIM_DATA_DIR = Pathname.new(File.dirname(__FILE__)).parent +QASIM_DATA_DIR = Pathname.new(File.dirname(__FILE__)).parent + "data" $:.push QASIM_INCLUDE_DIR require 'qasim' - require 'qasim/qasim_qrc' # QaSiM // Qt Sshfs Mapper From 9668de8256dcb85e0accf5d73ce1548c79dd3d03 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 27 Oct 2014 21:20:06 +0100 Subject: [PATCH 73/73] Clean Gemfile. Conflicts: Gemfile.lock --- Gemfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index 3bc8efd..f9120ad 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,4 @@ source 'https://rubygems.org' gemspec #gem "rdebug" -#gem "qtbindings" -#gem "qtbindings", "~> 4.8.3.0" #gem "thor"