QElectroTech is now able to open .titleblock files passed as arguments to the program.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1646 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-04-09 15:27:15 +00:00
parent b8ae554310
commit 8ba02ef932
6 changed files with 81 additions and 3 deletions

View File

@@ -16,6 +16,7 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "qetarguments.h"
#include "titleblock/templatescollection.h"
/**
Constructeur par defaut
@@ -51,6 +52,7 @@ QETArguments::QETArguments(const QETArguments &qet_arguments) :
QObject(qet_arguments.parent()),
project_files_(qet_arguments.project_files_),
element_files_(qet_arguments.element_files_),
tbt_files_(qet_arguments.tbt_files_),
options_(qet_arguments.options_),
unknown_options_(qet_arguments.unknown_options_),
#ifdef QET_ALLOW_OVERRIDE_CED_OPTION
@@ -76,6 +78,7 @@ common_tbt_dir_(qet_arguments.common_tbt_dir_),
QETArguments &QETArguments::operator=(const QETArguments &qet_arguments) {
project_files_ = qet_arguments.project_files_;
element_files_ = qet_arguments.element_files_;
tbt_files_ = qet_arguments.tbt_files_;
options_ = qet_arguments.options_;
unknown_options_ = qet_arguments.unknown_options_;
#ifdef QET_ALLOW_OVERRIDE_CED_OPTION
@@ -115,7 +118,7 @@ void QETArguments::setArguments(const QList<QString> &args) {
projet puis element.
*/
QList<QString> QETArguments::arguments() const {
return(options_ + unknown_options_ + project_files_ + element_files_);
return(options_ + unknown_options_ + project_files_ + element_files_ + tbt_files_);
}
/**
@@ -123,7 +126,7 @@ QList<QString> QETArguments::arguments() const {
Les fichiers de type projet viennent avant les fichiers de type element.
*/
QList<QString> QETArguments::files() const {
return(project_files_ + element_files_);
return(project_files_ + element_files_ + tbt_files_);
}
/**
@@ -140,6 +143,13 @@ QList<QString> QETArguments::elementFiles() const {
return(element_files_);
}
/**
@return title block template files
*/
QList<QString> QETArguments::titleBlockTemplateFiles() const {
return(tbt_files_);
}
/**
@return les options reconnues
*/
@@ -203,6 +213,10 @@ void QETArguments::handleFileArgument(const QString &file) {
if (!element_files_.contains(file)) {
element_files_ << file;
}
} else if (file.endsWith(TITLEBLOCKS_FILE_EXTENSION)) {
if (!tbt_files_.contains(file)) {
tbt_files_ << file;
}
} else {
if (!project_files_.contains(file)) {
project_files_ << file;