Compare commits
No commits in common. "master" and "alfa-testing-4" have entirely different histories.
master
...
alfa-testi
|
|
@ -6,20 +6,16 @@ A very simple project management system. Uses a custom flat binary file database
|
|||
|
||||
At it's current state it has a few very simple features tailored for a specific use set. Features include:
|
||||
|
||||
- Create, load, store, search through and manage a list of customers and their contact data
|
||||
- Create, load, store and manage a list of customers and their contact data
|
||||
- Create, load, store and manage a list of projects and project details
|
||||
- Able to sort customers under individual projects
|
||||
- Able to set notification thresholds that reminds you before a project starts and/or project ends
|
||||
- Thresholds are coded "green","yellow", and "red". The notification thresholds can be adjusted individually per project or globaly through the application settings
|
||||
|
||||
Check the "issues" page for functions (and bugs) that have been implemented (and resolved).
|
||||
|
||||
## About
|
||||
|
||||
I threw this program together over the weekend (version 0.1), because a friend needed project manager such as this. Coincidentally, the program is named after him :)
|
||||
|
||||
I know I have been sloppy with the naming convention of variables, which makes it hard (if not very hard) to read the source code by people who don't speak Norwegian. I will probably rewrite a large part of the code with a more understandable naming convention. The default language is also Norwegian which makes it impossible to translate to other languages if you don't already speak Norwegian. I will also addresss this in a future update.
|
||||
|
||||
## License
|
||||
|
||||
The program it's source and derivatives are licensed under GNU general public license (version 3) and copyrighted by me (Helge-Mikael Nordgård). See file "LICENSE" for more details.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ QT += core gui
|
|||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
|
||||
CONFIG += c++11
|
||||
RC_ICONS = saeterprosjekt_256.ico
|
||||
RC_ICONS = saeterprosjekt.ico
|
||||
|
||||
include(src/core/core.pri)
|
||||
include(src/mainwidgets/mainwidgets.pri)
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB |
625
res/LICENSE
625
res/LICENSE
|
|
@ -1,625 +0,0 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim copies of this license
|
||||
document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for software and
|
||||
other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed to take
|
||||
away your freedom to share and change the works. By contrast, the GNU General
|
||||
Public License is intended to guarantee your freedom to share and change all
|
||||
versions of a program--to make sure it remains free software for all its users.
|
||||
We, the Free Software Foundation, use the GNU General Public License for most
|
||||
of our software; it applies also to any other work released this way by its
|
||||
authors. You can apply it to your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not price. Our
|
||||
General Public Licenses are designed to make sure that you have the freedom
|
||||
to distribute copies of free software (and charge for them if you wish), that
|
||||
you receive source code or can get it if you want it, that you can change
|
||||
the software or use pieces of it in new free programs, and that you know you
|
||||
can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you these rights
|
||||
or asking you to surrender the rights. Therefore, you have certain responsibilities
|
||||
if you distribute copies of the software, or if you modify it: responsibilities
|
||||
to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether gratis or
|
||||
for a fee, you must pass on to the recipients the same freedoms that you received.
|
||||
You must make sure that they, too, receive or can get the source code. And
|
||||
you must show them these terms so they know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps: (1) assert
|
||||
copyright on the software, and (2) offer you this License giving you legal
|
||||
permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains that
|
||||
there is no warranty for this free software. For both users' and authors'
|
||||
sake, the GPL requires that modified versions be marked as changed, so that
|
||||
their problems will not be attributed erroneously to authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run modified
|
||||
versions of the software inside them, although the manufacturer can do so.
|
||||
This is fundamentally incompatible with the aim of protecting users' freedom
|
||||
to change the software. The systematic pattern of such abuse occurs in the
|
||||
area of products for individuals to use, which is precisely where 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 <https://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 <https://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 <https://www.gnu.org/
|
||||
licenses /why-not-lgpl.html>.
|
||||
File diff suppressed because it is too large
Load Diff
BIN
res/saeter.jpg
Normal file
BIN
res/saeter.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 804 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB |
|
|
@ -286,9 +286,5 @@
|
|||
<file>res/zap-off.svg</file>
|
||||
<file>res/zoom-in.svg</file>
|
||||
<file>res/zoom-out.svg</file>
|
||||
<file>res/postnummerregister-ansi.txt</file>
|
||||
<file>res/ArcticSoftwareBear.png</file>
|
||||
<file>res/saeterprosjekt_128.png</file>
|
||||
<file>res/LICENSE</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
BIN
saeterprosjekt.ico
Normal file
BIN
saeterprosjekt.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
|
|
@ -10,7 +10,6 @@ DEPENDPATH += \
|
|||
$$PWD/../uidialogs/widgetdialogs/prosjekt
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/loaderdialog.cpp \
|
||||
$$PWD/main.cpp \
|
||||
$$PWD/mainwindow.cpp \
|
||||
$$PWD/arbeidshest.cpp \
|
||||
|
|
@ -19,7 +18,6 @@ SOURCES += \
|
|||
$$PWD/globals.cpp
|
||||
|
||||
HEADERS += \
|
||||
$$PWD/loaderdialog.h \
|
||||
$$PWD/mainwindow.h \
|
||||
$$PWD/arbeidshest.h \
|
||||
$$PWD/datahandler.h \
|
||||
|
|
@ -27,7 +25,6 @@ HEADERS += \
|
|||
$$PWD/globals.h
|
||||
|
||||
FORMS += \
|
||||
$$PWD/loaderdialog.ui \
|
||||
$$PWD/mainwindow.ui
|
||||
|
||||
RESOURCES += \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ DataHandler::DataHandler(QObject *parent) : QObject(parent) {
|
|||
errorState = false;
|
||||
}
|
||||
|
||||
bool DataHandler::lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger, ProsjektBindingerDatoStempler &bindingerDatoStempler) {
|
||||
bool DataHandler::lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger) {
|
||||
QFile fil(filSti);
|
||||
if (!fil.open(QIODevice::WriteOnly)) {
|
||||
errorState = true;
|
||||
|
|
@ -20,14 +20,13 @@ bool DataHandler::lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKart
|
|||
ut << kartotek;
|
||||
ut << pKartotek;
|
||||
ut << bindinger;
|
||||
ut << bindingerDatoStempler;
|
||||
fil.flush();
|
||||
fil.close();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool DataHandler::lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger, ProsjektBindingerDatoStempler &bindingerDatoStempler) {
|
||||
bool DataHandler::lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger) {
|
||||
QFile fil(filSti);
|
||||
if (!fil.open(QIODevice::ReadOnly)) {
|
||||
errorState = true;
|
||||
|
|
@ -48,9 +47,9 @@ bool DataHandler::lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKarto
|
|||
errorState = true;
|
||||
errorCode = ErrorCodes::UGYLDIG_FIL;
|
||||
return false;
|
||||
}
|
||||
} else if (appVersjon != APP_VERSJON) {
|
||||
|
||||
if (dbVersjon != DB_VERSJON) {
|
||||
} else if (dbVersjon != DB_VERSJON) {
|
||||
errorState = true;
|
||||
errorCode = ErrorCodes::DB_VERSJONSKONFLIKT;
|
||||
return false;
|
||||
|
|
@ -59,18 +58,11 @@ bool DataHandler::lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKarto
|
|||
inn >> kartotek;
|
||||
inn >> pKartotek;
|
||||
inn >> bindinger;
|
||||
inn >> bindingerDatoStempler;
|
||||
fil.close();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
QString DataHandler::datoStempel() {
|
||||
QDateTime nu = QDateTime::currentDateTime();
|
||||
QString tidsFormat = "yyyy-MM-dd HH:mm:ss";
|
||||
return nu.toString(tidsFormat);
|
||||
}
|
||||
|
||||
bool DataHandler::hasError() {
|
||||
return errorState;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#define DATAHANDLER_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QDateTime>
|
||||
|
||||
#include "datatypes.h"
|
||||
#include "globals.h"
|
||||
|
|
@ -14,9 +13,8 @@ class DataHandler : public QObject
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit DataHandler(QObject *parent = nullptr);
|
||||
bool lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger, ProsjektBindingerDatoStempler &bindingerDatoStempler);
|
||||
bool lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger, ProsjektBindingerDatoStempler &bindingerDatoStempler);
|
||||
static QString datoStempel();
|
||||
bool lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger);
|
||||
bool lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger);
|
||||
|
||||
bool hasError();
|
||||
ErrorCodes getError();
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ typedef QList<QHash<QString, QVariant>> ProsjektKartotek;
|
|||
typedef QHash<QString, QVariant> ProsjektFil;
|
||||
|
||||
typedef QHash<int, QList<int>> ProsjektBindinger;
|
||||
typedef QHash<int, QHash<QString, QString>> ProsjektBindingerDatoStempler;
|
||||
typedef QHash<int, QString> PostNummerTabell;
|
||||
|
||||
enum ErrorCodes {
|
||||
APP_VERSJONSKONFLIKT,
|
||||
|
|
@ -39,18 +37,4 @@ enum UIElementer {
|
|||
FIRMANAVN
|
||||
};
|
||||
|
||||
enum CustomerFilters {
|
||||
ID,
|
||||
NAME,
|
||||
COMPANYNAME,
|
||||
PHONE,
|
||||
EMAIL
|
||||
};
|
||||
|
||||
enum ProjectFilters {
|
||||
ALL,
|
||||
ACTIVE,
|
||||
INACTIVE
|
||||
};
|
||||
|
||||
#endif // DATATYPES_H
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#include "globals.h"
|
||||
|
||||
qreal APP_VERSJON = 0.7;
|
||||
qreal DB_VERSJON = 0.2;
|
||||
qreal APP_VERSJON = 0.4;
|
||||
qreal DB_VERSJON = 0.1;
|
||||
quint64 APPLIKASJON_STEMPEL = (quint64)0xc4b351957b3bcf8;
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
#include "loaderdialog.h"
|
||||
#include "ui_loaderdialog.h"
|
||||
|
||||
LoaderDialog::LoaderDialog(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::LoaderDialog) {
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->labelAppVer->setText(tr("Versjon %1").arg(APP_VERSJON));
|
||||
}
|
||||
|
||||
LoaderDialog::~LoaderDialog() {
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void LoaderDialog::load() {
|
||||
QFile postNummerFil(":/res/postnummerregister-ansi.txt");
|
||||
QTimer *timer = new QTimer(this);
|
||||
connect(timer, &QTimer::timeout, this, QOverload<>::of(&LoaderDialog::timerDone));
|
||||
|
||||
int linjeNum = 0;
|
||||
if (postNummerFil.open(QIODevice::ReadOnly)) {
|
||||
QTextStream pIn(&postNummerFil);
|
||||
QStringList postnrListe = pIn.readAll().split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
|
||||
linjeNum = postnrListe.size();
|
||||
|
||||
ui->progressBar->setMinimum(0);
|
||||
ui->progressBar->setMaximum(linjeNum);
|
||||
|
||||
for (int i = 0; i < linjeNum; ++i) {
|
||||
QStringList linjeVerdi = postnrListe.at(i).split(":");
|
||||
ui->labelArbeidsBeskrivelse->setText(tr("Laster postkode %1 for by/sted: %2").arg(linjeVerdi.at(0).toInt()).arg(linjeVerdi.at(1)));
|
||||
emit sendPostNummer(linjeVerdi.at(0).toInt(), linjeVerdi.at(1));
|
||||
ui->progressBar->setValue(i + 1);
|
||||
}
|
||||
|
||||
ui->labelArbeidsBeskrivelse->setText(tr("Alle postkoder lastet inn"));
|
||||
}
|
||||
|
||||
postNummerFil.close();
|
||||
timer->setSingleShot(true);
|
||||
timer->start(7000);
|
||||
}
|
||||
|
||||
void LoaderDialog::timerDone() {
|
||||
emit finish();
|
||||
this->hide();
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#ifndef LOADERDIALOG_H
|
||||
#define LOADERDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QTimer>
|
||||
#include <QTranslator>
|
||||
|
||||
#include "globals.h"
|
||||
|
||||
namespace Ui {
|
||||
class LoaderDialog;
|
||||
}
|
||||
|
||||
class LoaderDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit LoaderDialog(QWidget *parent = nullptr);
|
||||
~LoaderDialog();
|
||||
void load();
|
||||
|
||||
signals:
|
||||
void sendPostNummer(int postNummer, QString postSted);
|
||||
void finish();
|
||||
|
||||
private slots:
|
||||
void timerDone();
|
||||
|
||||
private:
|
||||
Ui::LoaderDialog *ui;
|
||||
};
|
||||
|
||||
#endif // LOADERDIALOG_H
|
||||
|
|
@ -1,184 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>LoaderDialog</class>
|
||||
<widget class="QDialog" name="LoaderDialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>434</width>
|
||||
<height>598</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<widget class="QFrame" name="frame">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>0</y>
|
||||
<width>421</width>
|
||||
<height>471</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-image: url(:/res/ArcticSoftwareBear.png);
|
||||
background-repeat: no-repeat;</string>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<property name="lineWidth">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<property name="midLineWidth">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<widget class="QLabel" name="labelAppVer">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>290</x>
|
||||
<y>30</y>
|
||||
<width>86</width>
|
||||
<height>37</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Arial</family>
|
||||
<pointsize>10</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background: none;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Versjon 0.0.0</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="labelAppName">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>150</x>
|
||||
<y>10</y>
|
||||
<width>309</width>
|
||||
<height>37</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Arial</family>
|
||||
<pointsize>24</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background: none;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Sæterprosjekt</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="verticalLayoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>470</y>
|
||||
<width>421</width>
|
||||
<height>44</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelLaster">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background: none;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Laster inn ... vennligst vent</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="labelArbeidsBeskrivelse">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background: none;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QProgressBar" name="progressBar">
|
||||
<property name="styleSheet">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QLabel" name="labelCopyRight">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>520</y>
|
||||
<width>421</width>
|
||||
<height>71</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);
|
||||
background-color: rgb(0, 0, 0, 110);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Copyright (C) 2021 Helge-Mikael Nordgård. This software is licensed under the GNU general public license. By using this program you agree to the license terms as stipulated in the about box</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>6</number>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
|
@ -1,21 +1,10 @@
|
|||
#include "mainwindow.h"
|
||||
#include "loaderdialog.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QObject>
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
QApplication a(argc, argv);
|
||||
MainWindow w;
|
||||
// w.show();
|
||||
LoaderDialog loader;
|
||||
QObject::connect(&loader, SIGNAL(sendPostNummer(int,QString)), &w, SLOT(mottaPostNrSted(int,QString)));
|
||||
QObject::connect(&loader, SIGNAL(finish()), &w, SLOT(splashDone()));
|
||||
loader.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
|
||||
loader.setAttribute(Qt::WA_NoSystemBackground);
|
||||
loader.setAttribute(Qt::WA_TranslucentBackground);
|
||||
loader.setAttribute(Qt::WA_PaintOnScreen);
|
||||
loader.show();
|
||||
loader.load();
|
||||
w.show();
|
||||
return a.exec();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ void MainWindow::on_actionNy_triggered() {
|
|||
filSti = QFileDialog::getSaveFileName(this, tr("Opprett ny databasefil"), stdSted, tr("Database fil (*.saeter)"));
|
||||
// invokerer lagreFil fra DataHandler klassen der alle IO funksjoner ligger, kontroller om vi kan skrive til filen
|
||||
if (!filSti.isEmpty()) {
|
||||
if (!ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler)) {
|
||||
if (!ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger)) {
|
||||
ErrorCodes error = ioHandler->getError();
|
||||
switch (error) {
|
||||
case ErrorCodes::SKRIVEFEIL:
|
||||
|
|
@ -87,7 +87,7 @@ void MainWindow::on_action_pne_triggered() {
|
|||
|
||||
if (!filSti.isEmpty()) {
|
||||
// invokerer lastFil fra DataHandler klassen der alle IO funksjoner ligger
|
||||
if (!ioHandler->lastFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler)) {
|
||||
if (!ioHandler->lastFil(filSti, kundeKart, prosjektKart, bindinger)) {
|
||||
ErrorCodes error = ioHandler->getError();
|
||||
switch (error) {
|
||||
case ErrorCodes::UGYLDIG_FIL:
|
||||
|
|
@ -149,7 +149,7 @@ void MainWindow::on_action_pne_triggered() {
|
|||
|
||||
void MainWindow::on_actionLagre_triggered() {
|
||||
// invokerer lagreFil fra DataHandler klassen der alle IO funksjoner ligger
|
||||
ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler);
|
||||
ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger);
|
||||
// Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
|
||||
harFil = true;
|
||||
filLagret = true;
|
||||
|
|
@ -169,7 +169,7 @@ void MainWindow::on_actionL_agre_som_triggered() {
|
|||
filSti = QFileDialog::getSaveFileName(this, tr("Lagre gjeldende database med nytt navn"), stdSted, tr("Database fil (*.saeter)"));
|
||||
// invokerer lagreFil fra DataHandler klassen der alle IO funksjoner ligger, kontroller om vi kan skrive til filen
|
||||
if (!filSti.isEmpty()) {
|
||||
if (!ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler)) {
|
||||
if (!ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger)) {
|
||||
ErrorCodes error = ioHandler->getError();
|
||||
switch (error) {
|
||||
case ErrorCodes::SKRIVEFEIL:
|
||||
|
|
@ -338,7 +338,7 @@ void MainWindow::leggFilbaneTilHistorikk(QString filBane) {
|
|||
void MainWindow::lastDatabaseFil(QString fil) {
|
||||
filSti = fil;
|
||||
// invokerer lastFil fra DataHandler klassen der alle IO funksjoner ligger
|
||||
if (!ioHandler->lastFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler)) {
|
||||
if (!ioHandler->lastFil(filSti, kundeKart, prosjektKart, bindinger)) {
|
||||
ErrorCodes error = ioHandler->getError();
|
||||
switch (error) {
|
||||
case ErrorCodes::UGYLDIG_FIL:
|
||||
|
|
@ -466,7 +466,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
|
|||
int svar = bekreftBoks.exec();
|
||||
switch (svar) {
|
||||
case QMessageBox::Save:
|
||||
ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler);
|
||||
ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger);
|
||||
event->accept();
|
||||
break;
|
||||
case QMessageBox::Discard:
|
||||
|
|
@ -517,7 +517,6 @@ void MainWindow::on_commandCustomers_clicked() {
|
|||
connect(kundeW, SIGNAL(redigerKunde(int)), this, SLOT(visRedigerKundeDlg(int)));
|
||||
connect(kundeW, SIGNAL(slettKunde(int)), this, SLOT(slettKunde(int)));
|
||||
connect(kundeW, SIGNAL(tilordneProsjekt(int)), this, SLOT(visProsjektListe(int)));
|
||||
connect(kundeW, SIGNAL(startSok(QString)), this, SLOT(kundeSok(QString)));
|
||||
|
||||
ui->hovedLayout->insertWidget(0, kundeW);
|
||||
kundeW->lagKundeTabell(kundeKart);
|
||||
|
|
@ -551,7 +550,6 @@ void MainWindow::on_commandProsjekter_clicked() {
|
|||
connect(prosjektW, SIGNAL(slettProsjekt(int)), this, SLOT(slettProsjekt(int)));
|
||||
connect(prosjektW, SIGNAL(settAktiv(int)), this, SLOT(settAktivInaktiv(int)));
|
||||
connect(prosjektW, SIGNAL(fjernKunde(int,int)), this, SLOT(fjernKundeFraProsjekt(int,int)));
|
||||
connect(prosjektW, SIGNAL(filtrerKunKunder(bool)), SLOT(filtrerProsjektMedKunKunder(bool)));
|
||||
|
||||
ui->hovedLayout->insertWidget(0, prosjektW);
|
||||
prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart);
|
||||
|
|
@ -628,7 +626,6 @@ void MainWindow::hoppTilProsjekt(int prosjektId) {
|
|||
connect(prosjektW, SIGNAL(slettProsjekt(int)), this, SLOT(slettProsjekt(int)));
|
||||
connect(prosjektW, SIGNAL(settAktiv(int)), this, SLOT(settAktivInaktiv(int)));
|
||||
connect(prosjektW, SIGNAL(fjernKunde(int,int)), this, SLOT(fjernKundeFraProsjekt(int,int)));
|
||||
connect(prosjektW, SIGNAL(filtrerKunKunder(bool)), SLOT(filtrerProsjektMedKunKunder(bool)));
|
||||
|
||||
ui->hovedLayout->insertWidget(0, prosjektW);
|
||||
prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart, prosjektId);
|
||||
|
|
@ -794,16 +791,6 @@ void MainWindow::fjernKundeFraProsjekt(int prosjektKartotekPosisjon, int kundeID
|
|||
oppdaterTittel();
|
||||
}
|
||||
|
||||
/* filtrerProsjektMedKunKunder():
|
||||
* ------------------------------
|
||||
*
|
||||
* Tegner prosjekttreet på nytt og filtrerer og viser kun prosjekter med tilordnet kunder hvis bool = sann
|
||||
*/
|
||||
|
||||
void MainWindow::filtrerProsjektMedKunKunder(bool kunKunder) {
|
||||
prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart, 0, kunKunder);
|
||||
}
|
||||
|
||||
/* varsle():
|
||||
* ------------------------------
|
||||
*
|
||||
|
|
@ -819,27 +806,6 @@ void MainWindow::varsle(ProsjektFil prosjekt, AlertConditions kondisjon) {
|
|||
varsleDlg->show();
|
||||
}
|
||||
|
||||
|
||||
/* mottaPostNrSted():
|
||||
* ------------------------------
|
||||
*
|
||||
* Mater inn postnr og sted i postnr tabell hashen for bruk til autoutfylling av stedsnavn
|
||||
*/
|
||||
|
||||
void MainWindow::mottaPostNrSted(int postNr, QString postSted) {
|
||||
postStedTabell.insert(postNr, postSted);
|
||||
}
|
||||
|
||||
/* splashDone():
|
||||
* ------------------------------
|
||||
*
|
||||
* Starter funksjon som trigges når alle dataene er lastet og splashscreen lukkes
|
||||
*/
|
||||
|
||||
void MainWindow::splashDone() {
|
||||
this->show();
|
||||
}
|
||||
|
||||
/* visNyKundeDlg():
|
||||
* ------------------------------
|
||||
*
|
||||
|
|
@ -847,7 +813,7 @@ void MainWindow::splashDone() {
|
|||
*/
|
||||
|
||||
void MainWindow::visNyKundeDlg() {
|
||||
nyKdlg = new NyKundeDialog(this, &postStedTabell);
|
||||
nyKdlg = new NyKundeDialog(this);
|
||||
|
||||
connect(nyKdlg, SIGNAL(leggTilKunde(KundeFil)), this, SLOT(settInnNyKunde(KundeFil)));
|
||||
connect(nyKdlg, SIGNAL(rejected()), this, SLOT(barnDialogLukket()));
|
||||
|
|
@ -869,7 +835,7 @@ void MainWindow::visNyKundeDlg() {
|
|||
*/
|
||||
|
||||
void MainWindow::visRedigerKundeDlg(int posisjon) {
|
||||
redigerKdlg = new RedigerKundeDialog(this, &postStedTabell);
|
||||
redigerKdlg = new RedigerKundeDialog(this);
|
||||
|
||||
connect(redigerKdlg, SIGNAL(oppdaterKundeFil(KundeFil)), this, SLOT(redigerKunde(KundeFil)));
|
||||
connect(redigerKdlg, SIGNAL(rejected()), this, SLOT(barnDialogLukket()));
|
||||
|
|
@ -1003,22 +969,13 @@ void MainWindow::knyttProsjekt(int kunde, int prosjekt) {
|
|||
QList<int> kundeListe;
|
||||
QList<int> prosjektBindinger = bindinger.keys();
|
||||
if (!prosjektBindinger.contains(prosjekt)) {
|
||||
QHash<QString, QString> datoStempler;
|
||||
datoStempler.insert("created_at", DataHandler::datoStempel());
|
||||
datoStempler.insert("updated_at", DataHandler::datoStempel());
|
||||
|
||||
kundeListe.append(kunde);
|
||||
bindinger.insert(prosjekt, kundeListe);
|
||||
prosjektBindingerStempler.insert(prosjekt, datoStempler);
|
||||
} else {
|
||||
kundeListe = bindinger.value(prosjekt);
|
||||
QHash<QString, QString> datoStempler = prosjektBindingerStempler.value(prosjekt);
|
||||
if (!kundeListe.contains(kunde)) {
|
||||
kundeListe.append(kunde);
|
||||
datoStempler["updated_at"] = DataHandler::datoStempel();
|
||||
|
||||
bindinger[prosjekt] = kundeListe;
|
||||
prosjektBindingerStempler[prosjekt] = datoStempler;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1029,19 +986,6 @@ void MainWindow::knyttProsjekt(int kunde, int prosjekt) {
|
|||
QMessageBox::information(this, "Tilknyttet", tr("Kunde med kundenummer %1 er tilknyttet prosjekt med ordrenummer %2").arg(kunde).arg(prosjekt));
|
||||
}
|
||||
|
||||
/* kundeSok():
|
||||
* --------------------------------------
|
||||
*
|
||||
* Tegner kundetabellen på ny med filteret i Qstring
|
||||
*/
|
||||
|
||||
void MainWindow::kundeSok(QString sok) {
|
||||
if (sok.isEmpty())
|
||||
kundeW->lagKundeTabell(kundeKart);
|
||||
else
|
||||
kundeW->lagKundeTabell(kundeKart, true, sok);
|
||||
}
|
||||
|
||||
/* on_action_Innstillinger_triggered():
|
||||
* --------------------------------------
|
||||
*
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ private slots:
|
|||
void slettKunde(int posisjon);
|
||||
void visProsjektListe(int posisjon);
|
||||
void knyttProsjekt(int kunde, int prosjekt);
|
||||
void kundeSok(QString sok);
|
||||
|
||||
/* Prosjektslots */
|
||||
void on_commandProsjekter_clicked();
|
||||
|
|
@ -68,7 +67,6 @@ private slots:
|
|||
void slettProsjekt(int kartotekPlassering);
|
||||
void settAktivInaktiv(int kartotekPlassering);
|
||||
void fjernKundeFraProsjekt(int prosjektKartotekPosisjon, int kundeID);
|
||||
void filtrerProsjektMedKunKunder(bool kunKunder);
|
||||
|
||||
/* Ultøpslots */
|
||||
void on_commandDeadlines_clicked();
|
||||
|
|
@ -79,10 +77,6 @@ private slots:
|
|||
/* Arbeidshest slots */
|
||||
void varsle(ProsjektFil prosjekt, AlertConditions kondisjon);
|
||||
|
||||
/* Splashscreen slots */
|
||||
void mottaPostNrSted(int postNr, QString postSted);
|
||||
void splashDone();
|
||||
|
||||
private:
|
||||
Ui::MainWindow *ui;
|
||||
KundeWidget *kundeW;
|
||||
|
|
@ -121,7 +115,5 @@ private:
|
|||
ProsjektFil prosjektKort;
|
||||
ProsjektKartotek prosjektKart;
|
||||
ProsjektBindinger bindinger;
|
||||
ProsjektBindingerDatoStempler prosjektBindingerStempler;
|
||||
PostNummerTabell postStedTabell;
|
||||
};
|
||||
#endif // MAINWINDOW_H
|
||||
|
|
|
|||
|
|
@ -5,15 +5,13 @@ KundeWidget::KundeWidget(QWidget *parent) :
|
|||
QWidget(parent),
|
||||
ui(new Ui::KundeWidget) {
|
||||
ui->setupUi(this);
|
||||
|
||||
filterFelt = CustomerFilters::ID;
|
||||
}
|
||||
|
||||
KundeWidget::~KundeWidget() {
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void KundeWidget::lagKundeTabell(KundeKartotek &kundeKart, bool filtrer, QString filter) {
|
||||
void KundeWidget::lagKundeTabell(KundeKartotek &kundeKart) {
|
||||
ui->kundeTabell->clear();
|
||||
|
||||
connect(ui->kundeTabell, SIGNAL(itemClicked(QTableWidgetItem*)), this, SLOT(celleKlikk(QTableWidgetItem*)));
|
||||
|
|
@ -26,49 +24,6 @@ void KundeWidget::lagKundeTabell(KundeKartotek &kundeKart, bool filtrer, QString
|
|||
}
|
||||
}
|
||||
|
||||
// Hvis filtrer er sann, opprett nytt kundekartotek kalt "filtrertKartotek" og iterer igjennom aktivKartotek for dermed å legge til
|
||||
// felter som kun passer med filteret. Sett dermed "aktivKartotek" til det filtrerte kartoteket ("filtrertKartotek")
|
||||
if (filtrer) {
|
||||
KundeKartotek filtrertKartotek;
|
||||
for (int i = 0; i < aktivKartotek.size(); ++i) {
|
||||
switch (filterFelt) {
|
||||
case CustomerFilters::ID: {
|
||||
if (aktivKartotek.at(i).value("id").toString().contains(filter)) {
|
||||
kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CustomerFilters::NAME: {
|
||||
QString fulltNavn = aktivKartotek.at(i).value("fornavn").toString() + " " + aktivKartotek.at(i).value("etternavn").toString();
|
||||
if (fulltNavn.contains(filter, Qt::CaseSensitive)) {
|
||||
kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CustomerFilters::COMPANYNAME: {
|
||||
if (aktivKartotek.at(i).value("firmanavn").toString().contains(filter, Qt::CaseSensitive)) {
|
||||
kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CustomerFilters::PHONE: {
|
||||
if (aktivKartotek.at(i).value("tlf").toString().contains(filter)) {
|
||||
kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CustomerFilters::EMAIL: {
|
||||
if (aktivKartotek.at(i).value("epost").toString().contains(filter)) {
|
||||
kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
aktivKartotek = filtrertKartotek;
|
||||
}
|
||||
|
||||
QStringList overskrifter;
|
||||
overskrifter << tr("Kundenummer") << tr("Fornavn") << tr("Etternavn") << tr("Firmanavn") << tr("Telefonnr") << tr("Epostadresse");
|
||||
ui->kundeTabell->setRowCount(aktivKartotek.size());
|
||||
|
|
@ -138,46 +93,3 @@ void KundeWidget::on_pushProsjekt_clicked() {
|
|||
emit tilordneProsjekt(kundeNummer);
|
||||
}
|
||||
|
||||
|
||||
void KundeWidget::on_radioSokKundeNummer_clicked() {
|
||||
ui->lineSok->clear();
|
||||
ui->lineSok->setFocus();
|
||||
filterFelt = CustomerFilters::ID;
|
||||
}
|
||||
|
||||
|
||||
void KundeWidget::on_radioSokIFornavn_clicked() {
|
||||
ui->lineSok->clear();
|
||||
ui->lineSok->setFocus();
|
||||
filterFelt = CustomerFilters::NAME;
|
||||
}
|
||||
|
||||
|
||||
void KundeWidget::on_radioSokIFirma_clicked() {
|
||||
ui->lineSok->clear();
|
||||
ui->lineSok->setFocus();
|
||||
filterFelt = CustomerFilters::COMPANYNAME;
|
||||
}
|
||||
|
||||
|
||||
void KundeWidget::on_radioSokITlf_clicked() {
|
||||
ui->lineSok->clear();
|
||||
ui->lineSok->setFocus();
|
||||
filterFelt = CustomerFilters::PHONE;
|
||||
}
|
||||
|
||||
|
||||
void KundeWidget::on_radioSokIEpost_clicked() {
|
||||
ui->lineSok->clear();
|
||||
ui->lineSok->setFocus();
|
||||
filterFelt = CustomerFilters::EMAIL;
|
||||
}
|
||||
|
||||
|
||||
void KundeWidget::on_lineSok_textChanged(const QString &arg1) {
|
||||
emit startSok(arg1);
|
||||
}
|
||||
|
||||
void KundeWidget::kopierKartotekFelt(KundeFil kilde, KundeKartotek &maal) {
|
||||
maal << kilde;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@
|
|||
#define KUNDEWIDGET_H
|
||||
|
||||
#include <QWidget>
|
||||
#include <QTableWidget>
|
||||
#include <QTableWidgetItem>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionMatch>
|
||||
|
||||
#include "datahandler.h"
|
||||
#include "datatypes.h"
|
||||
|
|
@ -22,14 +19,13 @@ public:
|
|||
explicit KundeWidget(QWidget *parent = nullptr);
|
||||
~KundeWidget();
|
||||
|
||||
void lagKundeTabell(KundeKartotek &kundeKart, bool filtrer = false, QString filter = QString());
|
||||
void lagKundeTabell(KundeKartotek &kundeKart);
|
||||
|
||||
signals:
|
||||
void opprettKunde();
|
||||
void redigerKunde(int posisjon);
|
||||
void slettKunde(int posisjon);
|
||||
void tilordneProsjekt(int posisjon);
|
||||
void startSok(QString soekeStreng);
|
||||
|
||||
private slots:
|
||||
void on_pushNyKunde_clicked();
|
||||
|
|
@ -37,18 +33,10 @@ private slots:
|
|||
void on_pushRediger_clicked();
|
||||
void on_pushSlett_clicked();
|
||||
void on_pushProsjekt_clicked();
|
||||
void on_radioSokKundeNummer_clicked();
|
||||
void on_radioSokIFornavn_clicked();
|
||||
void on_radioSokIFirma_clicked();
|
||||
void on_radioSokITlf_clicked();
|
||||
void on_radioSokIEpost_clicked();
|
||||
void on_lineSok_textChanged(const QString &arg1);
|
||||
|
||||
private:
|
||||
Ui::KundeWidget *ui;
|
||||
int kundeNummer;
|
||||
CustomerFilters filterFelt;
|
||||
void kopierKartotekFelt(KundeFil kilde, KundeKartotek &maal);
|
||||
};
|
||||
|
||||
#endif // KUNDEWIDGET_H
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>532</width>
|
||||
<height>378</height>
|
||||
<width>543</width>
|
||||
<height>499</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
|
|
@ -58,115 +58,6 @@
|
|||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_7">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelSok">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Søk:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="lineSok"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelSokI">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Søk i:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioSokKundeNummer">
|
||||
<property name="text">
|
||||
<string>Kundenummer</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioSokIFornavn">
|
||||
<property name="text">
|
||||
<string>Navn</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioSokIFirma">
|
||||
<property name="text">
|
||||
<string>Firma</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioSokITlf">
|
||||
<property name="text">
|
||||
<string>Telefon</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioSokIEpost">
|
||||
<property name="text">
|
||||
<string>Epost</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_8">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QTableWidget" name="kundeTabell">
|
||||
<attribute name="verticalHeaderVisible">
|
||||
|
|
|
|||
|
|
@ -5,15 +5,13 @@ ProsjektWidget::ProsjektWidget(QWidget *parent) :
|
|||
QWidget(parent),
|
||||
ui(new Ui::ProsjektWidget) {
|
||||
ui->setupUi(this);
|
||||
|
||||
prosjektFiltre = ProjectFilters::ALL;
|
||||
}
|
||||
|
||||
ProsjektWidget::~ProsjektWidget() {
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void ProsjektWidget::oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger, KundeKartotek &kundeKart, int prosjekt, bool visKunKunder) {
|
||||
void ProsjektWidget::oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger, KundeKartotek &kundeKart, int prosjekt) {
|
||||
lokaltKartotek = kartotek;
|
||||
ui->prosjektTre->clear();
|
||||
ui->prosjektTre->setColumnCount(1);
|
||||
|
|
@ -25,60 +23,19 @@ void ProsjektWidget::oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektB
|
|||
QIcon prosjektFerdigIkon(":/res/check.svg");
|
||||
QIcon kundeIkon(":/res/user.svg");
|
||||
|
||||
ProsjektKartotek filtrertKartotek = kartotek;
|
||||
|
||||
if (visKunKunder) {
|
||||
filtrertKartotek.clear();
|
||||
for (int i = 0; i < kartotek.size(); ++i) {
|
||||
bool harBinding = false;
|
||||
if (bindinger.contains(kartotek.at(i).value("ordrenummer").toInt()))
|
||||
harBinding = true;
|
||||
|
||||
if (harBinding)
|
||||
filtrertKartotek << kartotek.at(i);
|
||||
}
|
||||
}
|
||||
|
||||
ProsjektKartotek ytterligereFiltrertKartotek;
|
||||
|
||||
switch (prosjektFiltre) {
|
||||
case ProjectFilters::ALL: {
|
||||
ytterligereFiltrertKartotek = filtrertKartotek;
|
||||
break;
|
||||
}
|
||||
case ProjectFilters::ACTIVE: {
|
||||
for (int i = 0; i < filtrertKartotek.size(); ++i) {
|
||||
bool ferdig = filtrertKartotek.at(i).value("ferdig").toBool();
|
||||
if (!ferdig)
|
||||
ytterligereFiltrertKartotek << filtrertKartotek.at(i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ProjectFilters::INACTIVE: {
|
||||
for (int i = 0; i < filtrertKartotek.size(); ++i) {
|
||||
bool ferdig = filtrertKartotek.at(i).value("ferdig").toBool();
|
||||
if (ferdig)
|
||||
ytterligereFiltrertKartotek << filtrertKartotek.at(i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
filtrertKartotek = ytterligereFiltrertKartotek;
|
||||
|
||||
for (int i = 0; i < filtrertKartotek.size(); ++i) {
|
||||
bool aktiv = filtrertKartotek.at(i).value("active").toBool();
|
||||
bool aktiv = kartotek.at(i).value("active").toBool();
|
||||
if (aktiv) {
|
||||
bool ferdig = filtrertKartotek.at(i).value("ferdig").toBool();
|
||||
bool ferdig = kartotek.at(i).value("ferdig").toBool();
|
||||
QTreeWidgetItem *prosjektGjenstand = new QTreeWidgetItem(QTreeWidgetItem::Type);
|
||||
prosjektGjenstand->setText(0, filtrertKartotek.at(i).value("prosjektnavn").toString());
|
||||
prosjektGjenstand->setText(0, kartotek.at(i).value("prosjektnavn").toString());
|
||||
|
||||
if (ferdig)
|
||||
prosjektGjenstand->setIcon(0,prosjektFerdigIkon);
|
||||
else
|
||||
prosjektGjenstand->setIcon(0, prosjektIkon);
|
||||
|
||||
int ordrenummer = filtrertKartotek.at(i).value("ordrenummer").toInt();
|
||||
int ordrenummer = kartotek.at(i).value("ordrenummer").toInt();
|
||||
QList<QTreeWidgetItem *> kundeGjenstander;
|
||||
if (bindinger.contains(ordrenummer)) {
|
||||
QList<int> kunder = bindinger.value(ordrenummer);
|
||||
|
|
@ -102,7 +59,7 @@ void ProsjektWidget::oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektB
|
|||
prosjektGjenstand->addChildren(kundeGjenstander);
|
||||
}
|
||||
|
||||
prosjektGjenstand->setData(0, Qt::UserRole, filtrertKartotek.at(i).value("ordrenummer").toInt());
|
||||
prosjektGjenstand->setData(0, Qt::UserRole, kartotek.at(i).value("ordrenummer").toInt());
|
||||
prosjektListe.append(prosjektGjenstand);
|
||||
}
|
||||
}
|
||||
|
|
@ -199,26 +156,3 @@ void ProsjektWidget::on_pushMerkFerdig_clicked() {
|
|||
void ProsjektWidget::on_pushFjernKunde_clicked() {
|
||||
emit fjernKunde(kartotekPosisjon, kundeID);
|
||||
}
|
||||
|
||||
void ProsjektWidget::on_checkHarBarn_clicked() {
|
||||
emit filtrerKunKunder(ui->checkHarBarn->isChecked());
|
||||
}
|
||||
|
||||
|
||||
void ProsjektWidget::on_radioVisAlle_clicked() {
|
||||
prosjektFiltre = ProjectFilters::ALL;
|
||||
emit filtrerKunKunder(ui->checkHarBarn->isChecked());
|
||||
}
|
||||
|
||||
|
||||
void ProsjektWidget::on_radioVisAktive_clicked() {
|
||||
prosjektFiltre = ProjectFilters::ACTIVE;
|
||||
emit filtrerKunKunder(ui->checkHarBarn->isChecked());
|
||||
}
|
||||
|
||||
|
||||
void ProsjektWidget::on_radioVisFerdige_clicked() {
|
||||
prosjektFiltre = ProjectFilters::INACTIVE;
|
||||
emit filtrerKunKunder(ui->checkHarBarn->isChecked());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ public:
|
|||
explicit ProsjektWidget(QWidget *parent = nullptr);
|
||||
~ProsjektWidget();
|
||||
|
||||
void oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger, KundeKartotek &kundeKart, int prosjekt = 0, bool visKunKunder = false);
|
||||
void oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger, KundeKartotek &kundeKart, int prosjekt = 0);
|
||||
void settGjeldendeProsjekt(ProsjektFil prosjekt);
|
||||
|
||||
signals:
|
||||
|
|
@ -27,7 +27,6 @@ signals:
|
|||
void slettProsjekt(int kartotekPlassering);
|
||||
void settAktiv(int kartotekPlassering);
|
||||
void fjernKunde(int prosjektKartotekPosisjon, int kundeID);
|
||||
void filtrerKunKunder(bool visKunKunder);
|
||||
|
||||
private slots:
|
||||
void on_pushNy_clicked();
|
||||
|
|
@ -36,16 +35,11 @@ private slots:
|
|||
void on_pushSlett_clicked();
|
||||
void on_pushMerkFerdig_clicked();
|
||||
void on_pushFjernKunde_clicked();
|
||||
void on_checkHarBarn_clicked();
|
||||
void on_radioVisAlle_clicked();
|
||||
void on_radioVisAktive_clicked();
|
||||
void on_radioVisFerdige_clicked();
|
||||
|
||||
private:
|
||||
Ui::ProsjektWidget *ui;
|
||||
ProsjektFil valgtProsjekt;
|
||||
ProsjektKartotek lokaltKartotek;
|
||||
ProjectFilters prosjektFiltre;
|
||||
|
||||
void prosjektUI();
|
||||
void kundeUI();
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>637</width>
|
||||
<height>439</height>
|
||||
<width>605</width>
|
||||
<height>427</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
|
|
@ -255,58 +255,6 @@
|
|||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelFiltrerProsjekter">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Vis/ filtrer prosjekter:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioVisAlle">
|
||||
<property name="text">
|
||||
<string>Vis alle prosjekter</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioVisAktive">
|
||||
<property name="text">
|
||||
<string>Vis kun aktive</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioVisFerdige">
|
||||
<property name="text">
|
||||
<string>Vis kun ferdige</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="checkHarBarn">
|
||||
<property name="text">
|
||||
<string>Vis kun prosjekter med tilordnede kunder</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBeskrivelse">
|
||||
<property name="title">
|
||||
|
|
|
|||
|
|
@ -5,13 +5,6 @@ OmDialog::OmDialog(QWidget *parent) :
|
|||
QDialog(parent),
|
||||
ui(new Ui::OmDialog) {
|
||||
ui->setupUi(this);
|
||||
|
||||
QFile lisensFil(":/res/LICENSE");
|
||||
if (lisensFil.open(QIODevice::ReadOnly)) {
|
||||
QTextStream lisens(&lisensFil);
|
||||
ui->textBrowserLisens->setText(lisens.readAll());
|
||||
}
|
||||
lisensFil.close();
|
||||
}
|
||||
|
||||
OmDialog::~OmDialog() {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
#define OMDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
|
||||
namespace Ui {
|
||||
class OmDialog;
|
||||
|
|
|
|||
|
|
@ -6,63 +6,16 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>637</width>
|
||||
<height>656</height>
|
||||
<width>386</width>
|
||||
<height>257</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Om dette programmet</string>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<property name="sizeConstraint">
|
||||
<enum>QLayout::SetDefaultConstraint</enum>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="labelLogo">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>128</width>
|
||||
<height>128</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-image: url(:/res/saeterprosjekt_128.png);
|
||||
background-repeat: no-repeat;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelAppHeadline">
|
||||
<property name="font">
|
||||
|
|
@ -72,14 +25,8 @@ background-repeat: no-repeat;</string>
|
|||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-image: none !important;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-size:18pt; font-weight:600;">Sæterprosjekt</span></p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-size:18pt; font-weight:600; color:#ff0000;">Sæte</span><span style=" font-size:18pt; font-weight:600; color:#004add;">rp</span><span style=" font-size:18pt; font-weight:600; color:#ffffff;">r</span><span style=" font-size:18pt; font-weight:600; color:#004add;">os</span><span style=" font-size:18pt; font-weight:600; color:#ff0000;">jekt</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
|
|
@ -89,6 +36,10 @@ background-repeat: no-repeat;</string>
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelVersjon">
|
||||
<property name="font">
|
||||
|
|
@ -96,9 +47,6 @@ background-repeat: no-repeat;</string>
|
|||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-image: none;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
</property>
|
||||
|
|
@ -107,37 +55,6 @@ background-repeat: no-repeat;</string>
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Fixed</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>68</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
|
|
@ -159,7 +76,7 @@ background-repeat: no-repeat;</string>
|
|||
<item>
|
||||
<widget class="QLabel" name="labelDesc">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p>For å laste ned kildekoden, nye utgivelser, rapportere bugs m.m. kan du besøke <a href="https://git.outlands.no/heno/Saeterprosjekt"><span style=" text-decoration: underline; color:#0000ff;">prosjektets hjemmeside</span></a>.</p><p>Dette programmet er kopibeskyttet og lisensiert under GPLv3 (GNU General Public License versjon 3). Programmet er åpen og fri kildekode og kan modifiseres og redistribueres under visse betingelser. Ved å bruke dette programmet, aksepterer du at du har forstått og godtatt lisensbetingelsene under</p></body></html></string>
|
||||
<string><html><head/><body><p>Dette programmet er kopibeskyttet og lisensiert under GPLv3 (GNU General Public License versjon 3). Programmet er åpen og fri kildekode og kan modifiseres og redistribueres under visse betingelser. </p><p><a href="https://www.gnu.org/licenses/gpl-3.0.html"><span style=" text-decoration: underline; color:#0000ff;">Du kan lese lisensen i sin helhet her.</span></a></p><p>For å laste ned kildekoden, nye utgivelser, rapportere bugs m.m. kan du besøke <a href="https://git.outlands.no/heno/Saeterprosjekt"><span style=" text-decoration: underline; color:#0000ff;">prosjektets hjemmeside</span></a>.</p></body></html></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
|
|
@ -173,33 +90,17 @@ background-repeat: no-repeat;</string>
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelLisens">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Lisensbetingelser:</string>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QTextBrowser" name="textBrowserLisens">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "nykundedialog.h"
|
||||
#include "ui_nykundedialog.h"
|
||||
|
||||
NyKundeDialog::NyKundeDialog(QWidget *parent, PostNummerTabell *postNrTabell) :
|
||||
NyKundeDialog::NyKundeDialog(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::NyKundeDialog) {
|
||||
ui->setupUi(this);
|
||||
|
|
@ -9,8 +9,6 @@ NyKundeDialog::NyKundeDialog(QWidget *parent, PostNummerTabell *postNrTabell) :
|
|||
ui->lineTlf->setValidator(new QIntValidator(10000000, 99999999, this));
|
||||
ui->linePostnr->setValidator(new QIntValidator(1000, 9999, this));
|
||||
ui->labelFeilMelding->setText("");
|
||||
|
||||
postNummere = postNrTabell;
|
||||
}
|
||||
|
||||
NyKundeDialog::~NyKundeDialog() {
|
||||
|
|
@ -50,6 +48,7 @@ void NyKundeDialog::on_pushAvbryt_clicked() {
|
|||
QDialog::close();
|
||||
}
|
||||
|
||||
|
||||
void NyKundeDialog::on_pushButton_clicked() {
|
||||
KundeFil nyKunde;
|
||||
nyKunde.insert("fornavn", ui->lineFornavn->text());
|
||||
|
|
@ -62,13 +61,7 @@ void NyKundeDialog::on_pushButton_clicked() {
|
|||
nyKunde.insert("tlf", ui->lineTlf->text().toInt());
|
||||
nyKunde.insert("id", ui->lineKundenummer->text().toInt());
|
||||
nyKunde.insert("active", true);
|
||||
nyKunde.insert("created_at", DataHandler::datoStempel());
|
||||
nyKunde.insert("updated_at", DataHandler::datoStempel());
|
||||
|
||||
emit leggTilKunde(nyKunde);
|
||||
}
|
||||
|
||||
void NyKundeDialog::on_linePostnr_editingFinished() {
|
||||
ui->lineSted->setText(postNummere->value(ui->linePostnr->text().toInt()));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include <QDialog>
|
||||
#include <QIntValidator>
|
||||
#include "datahandler.h"
|
||||
#include "datatypes.h"
|
||||
|
||||
namespace Ui {
|
||||
|
|
@ -15,7 +14,7 @@ class NyKundeDialog : public QDialog
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit NyKundeDialog(QWidget *parent = nullptr, PostNummerTabell *postNrTabell = nullptr);
|
||||
explicit NyKundeDialog(QWidget *parent = nullptr);
|
||||
~NyKundeDialog();
|
||||
|
||||
void startTopp();
|
||||
|
|
@ -30,11 +29,9 @@ signals:
|
|||
private slots:
|
||||
void on_pushAvbryt_clicked();
|
||||
void on_pushButton_clicked();
|
||||
void on_linePostnr_editingFinished();
|
||||
|
||||
private:
|
||||
Ui::NyKundeDialog *ui;
|
||||
PostNummerTabell *postNummere;
|
||||
};
|
||||
|
||||
#endif // NYKUNDEDIALOG_H
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
#include "redigerkundedialog.h"
|
||||
#include "ui_redigerkundedialog.h"
|
||||
|
||||
RedigerKundeDialog::RedigerKundeDialog(QWidget *parent, PostNummerTabell *postNrTabell) :
|
||||
RedigerKundeDialog::RedigerKundeDialog(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::RedigerKundeDialog) {
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->labelFeilMelding->setText("");
|
||||
|
||||
postNummere = postNrTabell;
|
||||
}
|
||||
|
||||
RedigerKundeDialog::~RedigerKundeDialog() {
|
||||
|
|
@ -69,13 +67,7 @@ void RedigerKundeDialog::on_pushButton_clicked() {
|
|||
oppdatertFil.insert("epost", ui->lineEpost->text());
|
||||
oppdatertFil.insert("tlf", ui->lineTlf->text().toInt());
|
||||
oppdatertFil.insert("active", true);
|
||||
oppdatertFil.insert("updated_at", DataHandler::datoStempel());
|
||||
|
||||
emit oppdaterKundeFil(oppdatertFil);
|
||||
}
|
||||
|
||||
|
||||
void RedigerKundeDialog::on_linePostnr_editingFinished() {
|
||||
ui->lineSted->setText(postNummere->value(ui->linePostnr->text().toInt()));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#define REDIGERKUNDEDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include "datahandler.h"
|
||||
#include "datatypes.h"
|
||||
|
||||
namespace Ui {
|
||||
|
|
@ -14,7 +13,7 @@ class RedigerKundeDialog : public QDialog
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit RedigerKundeDialog(QWidget *parent = nullptr, PostNummerTabell *postNrTabell = nullptr);
|
||||
explicit RedigerKundeDialog(QWidget *parent = nullptr);
|
||||
~RedigerKundeDialog();
|
||||
|
||||
void settInnGamleVerdier(KundeFil gjeldendeKundeFil);
|
||||
|
|
@ -28,11 +27,8 @@ private slots:
|
|||
void on_pushAvbryt_clicked();
|
||||
void on_pushButton_clicked();
|
||||
|
||||
void on_linePostnr_editingFinished();
|
||||
|
||||
private:
|
||||
Ui::RedigerKundeDialog *ui;
|
||||
PostNummerTabell *postNummere;
|
||||
};
|
||||
|
||||
#endif // REDIGERKUNDEDIALOG_H
|
||||
|
|
|
|||
|
|
@ -69,8 +69,6 @@ void NyttProsjektDialog::on_pushLagre_clicked() {
|
|||
|
||||
nyttProsjekt.insert("active", true);
|
||||
nyttProsjekt.insert("ferdig", false);
|
||||
nyttProsjekt.insert("created_at", DataHandler::datoStempel());
|
||||
nyttProsjekt.insert("updated_at", DataHandler::datoStempel());
|
||||
|
||||
emit leggTilProsjekt(nyttProsjekt);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#define NYTTPROSJEKTDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include "datahandler.h"
|
||||
#include "datatypes.h"
|
||||
|
||||
namespace Ui {
|
||||
|
|
|
|||
|
|
@ -101,7 +101,6 @@ void RedigerProsjektDialog::on_pushLagre_clicked() {
|
|||
|
||||
nyttProsjekt.insert("active", true);
|
||||
nyttProsjekt.insert("ferdig", false);
|
||||
nyttProsjekt.insert("updated_at", DataHandler::datoStempel());
|
||||
|
||||
emit lagreProsjekt(nyttProsjekt);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#define REDIGERPROSJEKTDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include "datahandler.h"
|
||||
#include "datatypes.h"
|
||||
|
||||
namespace Ui {
|
||||
|
|
|
|||
|
|
@ -61,150 +61,71 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="89"/>
|
||||
<source>Søk:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="109"/>
|
||||
<source>Søk i:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="126"/>
|
||||
<source>Navn</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="133"/>
|
||||
<source>Firma</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="140"/>
|
||||
<source>Telefon</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="147"/>
|
||||
<source>Epost</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="201"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="92"/>
|
||||
<source>Valgte kunde: </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="208"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="99"/>
|
||||
<source>Ingen kunde valgt</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="245"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="136"/>
|
||||
<source>Ny kunde</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="255"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="146"/>
|
||||
<source>Rediger kunde</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="265"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="156"/>
|
||||
<source>Slett kunde</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="275"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="166"/>
|
||||
<source>Tilordne prosjekt</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="73"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="28"/>
|
||||
<source>Fornavn</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="73"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="28"/>
|
||||
<source>Etternavn</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="73"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="28"/>
|
||||
<source>Firmanavn</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="73"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="28"/>
|
||||
<source>Telefonnr</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="73"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="28"/>
|
||||
<source>Epostadresse</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.ui" line="116"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="73"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="28"/>
|
||||
<source>Kundenummer</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="129"/>
|
||||
<location filename="../src/mainwidgets/kundewidget.cpp" line="84"/>
|
||||
<source>kundenr. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>LoaderDialog</name>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.ui" line="14"/>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.ui" line="63"/>
|
||||
<source>Versjon 0.0.0</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.ui" line="93"/>
|
||||
<source>Sæterprosjekt</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.ui" line="124"/>
|
||||
<source>Laster inn ... vennligst vent</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.ui" line="134"/>
|
||||
<source>-</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.ui" line="169"/>
|
||||
<source>Copyright (C) 2021 Helge-Mikael Nordgård. This software is licensed under the GNU general public license. By using this program you agree to the license terms as stipulated in the about box</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.cpp" line="9"/>
|
||||
<source>Versjon %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.cpp" line="32"/>
|
||||
<source>Laster postkode %1 for by/sted: %2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/loaderdialog.cpp" line="37"/>
|
||||
<source>Alle postkoder lastet inn</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindow</name>
|
||||
<message>
|
||||
|
|
@ -430,34 +351,34 @@ First string "An error occurred" Second string "This does not app
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/mainwindow.cpp" line="741"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="738"/>
|
||||
<source>Vil du slette dette prosjektet? Kundene som eventuelt er tilknyttet prosjektet vil ikke bli slettet</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/mainwindow.cpp" line="893"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="917"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="859"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="883"/>
|
||||
<source>Fornavn feltet er påkrevd</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/mainwindow.cpp" line="896"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="920"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="862"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="886"/>
|
||||
<source>Etternavn feltet er påkrevd</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/mainwindow.cpp" line="923"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="889"/>
|
||||
<source>Firmanavn feltet er påkrevd</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/mainwindow.cpp" line="950"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="916"/>
|
||||
<source>Vil du slette denne kunden? Prosjektdataene som eventuelt er tilknyttet, vil ikke bli slettet.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/core/mainwindow.cpp" line="1020"/>
|
||||
<location filename="../src/core/mainwindow.cpp" line="986"/>
|
||||
<source>Kunde med kundenummer %1 er tilknyttet prosjekt med ordrenummer %2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -530,12 +451,12 @@ First string "An error occurred" Second string "This does not app
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/widgetdialogs/kunde/nykundedialog.cpp" line="46"/>
|
||||
<location filename="../src/uidialogs/widgetdialogs/kunde/nykundedialog.cpp" line="44"/>
|
||||
<source><span style="font-weight:600; color:#ff0000;">%1: </span><span style="font-weight:600;"/><span style="color:#000000;">%2</span></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/widgetdialogs/kunde/nykundedialog.cpp" line="46"/>
|
||||
<location filename="../src/uidialogs/widgetdialogs/kunde/nykundedialog.cpp" line="44"/>
|
||||
<source>Feil:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -638,37 +559,32 @@ First string "An error occurred" Second string "This does not app
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="82"/>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt; font-weight:600;">Sæterprosjekt</span></p></body></html></source>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="29"/>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt; font-weight:600; color:#ff0000;">Sæte</span><span style=" font-size:18pt; font-weight:600; color:#004add;">rp</span><span style=" font-size:18pt; font-weight:600; color:#ffffff;">r</span><span style=" font-size:18pt; font-weight:600; color:#004add;">os</span><span style=" font-size:18pt; font-weight:600; color:#ff0000;">jekt</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="103"/>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="51"/>
|
||||
<source>TextLabel</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="152"/>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="69"/>
|
||||
<source>Kopirett(c) av Helge-Mikael Nordgård</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="162"/>
|
||||
<source><html><head/><body><p>For å laste ned kildekoden, nye utgivelser, rapportere bugs m.m. kan du besøke <a href="https://git.outlands.no/heno/Saeterprosjekt"><span style=" text-decoration: underline; color:#0000ff;">prosjektets hjemmeside</span></a>.</p><p>Dette programmet er kopibeskyttet og lisensiert under GPLv3 (GNU General Public License versjon 3). Programmet er åpen og fri kildekode og kan modifiseres og redistribueres under visse betingelser. Ved å bruke dette programmet, aksepterer du at du har forstått og godtatt lisensbetingelsene under</p></body></html></source>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="79"/>
|
||||
<source><html><head/><body><p>Dette programmet er kopibeskyttet og lisensiert under GPLv3 (GNU General Public License versjon 3). Programmet er åpen og fri kildekode og kan modifiseres og redistribueres under visse betingelser. </p><p><a href="https://www.gnu.org/licenses/gpl-3.0.html"><span style=" text-decoration: underline; color:#0000ff;">Du kan lese lisensen i sin helhet her.</span></a></p><p>For å laste ned kildekoden, nye utgivelser, rapportere bugs m.m. kan du besøke <a href="https://git.outlands.no/heno/Saeterprosjekt"><span style=" text-decoration: underline; color:#0000ff;">prosjektets hjemmeside</span></a>.</p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="186"/>
|
||||
<source>Lisensbetingelser:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="222"/>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.ui" line="123"/>
|
||||
<source>Ok</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.cpp" line="22"/>
|
||||
<location filename="../src/uidialogs/maindialogs/omdialog.cpp" line="15"/>
|
||||
<source>Versjon %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -718,67 +634,42 @@ First string "An error occurred" Second string "This does not app
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="269"/>
|
||||
<source>Vis/ filtrer prosjekter:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="278"/>
|
||||
<source>Vis alle prosjekter</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="288"/>
|
||||
<source>Vis kun aktive</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="295"/>
|
||||
<source>Vis kun ferdige</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="302"/>
|
||||
<source>Vis kun prosjekter med tilordnede kunder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="313"/>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="261"/>
|
||||
<source>Ordrebeskrivelse</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="340"/>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="288"/>
|
||||
<source>Nytt prosjekt</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="350"/>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="298"/>
|
||||
<source>Rediger prosjekt</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="360"/>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="308"/>
|
||||
<source>Slett prosjekt</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="370"/>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="318"/>
|
||||
<source>Marker som avsluttet/startet</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="380"/>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.ui" line="328"/>
|
||||
<source>Fjern kunde</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.cpp" line="92"/>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.cpp" line="49"/>
|
||||
<source>(%1)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.cpp" line="97"/>
|
||||
<location filename="../src/mainwidgets/prosjektwidget.cpp" line="54"/>
|
||||
<source>%1 %2 %3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -851,12 +742,12 @@ First string "An error occurred" Second string "This does not app
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/widgetdialogs/kunde/redigerkundedialog.cpp" line="52"/>
|
||||
<location filename="../src/uidialogs/widgetdialogs/kunde/redigerkundedialog.cpp" line="50"/>
|
||||
<source><span style="font-weight:600; color:#ff0000;">%1: </span><span style="font-weight:600;"/><span style="color:#000000;">%2</span></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/uidialogs/widgetdialogs/kunde/redigerkundedialog.cpp" line="52"/>
|
||||
<location filename="../src/uidialogs/widgetdialogs/kunde/redigerkundedialog.cpp" line="50"/>
|
||||
<source>Feil:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user