Commit Dialog:
- Commit messages must not be empty - Double-clicking a file invokes diff FileAction Dialog: - Optional checkbox MainWindow: - Added Rename/Undo/About Actions - Added Renamed/Missing file states - Added tooltips to status column - Support for running fossil in detached mode (to prevent killing fossil due to timeout on diff sessions) FossilOrigin-Name: ea42e7cd8b7041d82e35720b14e30437b6db6e0d
This commit is contained in:
@ -1,7 +1,9 @@
|
|||||||
#include "CommitDialog.h"
|
#include "CommitDialog.h"
|
||||||
|
#include <QPushButton>
|
||||||
#include "ui_CommitDialog.h"
|
#include "ui_CommitDialog.h"
|
||||||
|
#include "MainWindow.h" // Ugly. I know.
|
||||||
|
|
||||||
CommitDialog::CommitDialog(const QStringList &commitMsgHistory, const QStringList &files, QWidget *parent) :
|
CommitDialog::CommitDialog(QWidget *parent, const QStringList &commitMsgHistory, const QStringList &files) :
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
ui(new Ui::CommitDialog)
|
ui(new Ui::CommitDialog)
|
||||||
{
|
{
|
||||||
@ -16,14 +18,16 @@ CommitDialog::CommitDialog(const QStringList &commitMsgHistory, const QStringLis
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
CommitDialog::~CommitDialog()
|
CommitDialog::~CommitDialog()
|
||||||
{
|
{
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CommitDialog::run(QString &commitMsg, const QStringList &commitMsgHistory, const QStringList &files, QWidget *parent)
|
//------------------------------------------------------------------------------
|
||||||
|
bool CommitDialog::run(QWidget *parent, QString &commitMsg, const QStringList &commitMsgHistory, const QStringList &files)
|
||||||
{
|
{
|
||||||
CommitDialog dlg(commitMsgHistory, files, parent);
|
CommitDialog dlg(parent, commitMsgHistory, files);
|
||||||
int res = dlg.exec();
|
int res = dlg.exec();
|
||||||
if(res==QDialog::Accepted)
|
if(res==QDialog::Accepted)
|
||||||
{
|
{
|
||||||
@ -34,7 +38,22 @@ bool CommitDialog::run(QString &commitMsg, const QStringList &commitMsgHistory,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
void CommitDialog::on_comboBox_activated(const QString &arg1)
|
void CommitDialog::on_comboBox_activated(const QString &arg1)
|
||||||
{
|
{
|
||||||
ui->plainTextEdit->setPlainText(arg1);
|
ui->plainTextEdit->setPlainText(arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
void CommitDialog::on_plainTextEdit_textChanged()
|
||||||
|
{
|
||||||
|
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!ui->plainTextEdit->toPlainText().isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
void CommitDialog::on_listView_doubleClicked(const QModelIndex &index)
|
||||||
|
{
|
||||||
|
QVariant data = itemModel.data(index);
|
||||||
|
QString filename = data.toString();
|
||||||
|
reinterpret_cast<MainWindow*>(parent())->diffFile(filename);
|
||||||
|
}
|
||||||
|
@ -13,13 +13,15 @@ class CommitDialog : public QDialog
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CommitDialog(const QStringList &commitMsgHistory, const QStringList &files, QWidget *parent = 0);
|
explicit CommitDialog(QWidget *parent, const QStringList &commitMsgHistory, const QStringList &files);
|
||||||
~CommitDialog();
|
~CommitDialog();
|
||||||
|
|
||||||
static bool run(QString &commitMsg, const QStringList &commitMsgHistory, const QStringList &files, QWidget *parent);
|
static bool run(QWidget *parent, QString &commitMsg, const QStringList &commitMsgHistory, const QStringList &files);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void on_comboBox_activated(const QString &arg1);
|
void on_comboBox_activated(const QString &arg1);
|
||||||
|
void on_plainTextEdit_textChanged();
|
||||||
|
void on_listView_doubleClicked(const QModelIndex &index);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::CommitDialog *ui;
|
Ui::CommitDialog *ui;
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="selectionMode">
|
<property name="selectionMode">
|
||||||
<enum>QAbstractItemView::NoSelection</enum>
|
<enum>QAbstractItemView::SingleSelection</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="selectionBehavior">
|
<property name="selectionBehavior">
|
||||||
<enum>QAbstractItemView::SelectRows</enum>
|
<enum>QAbstractItemView::SelectRows</enum>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "FileActionDialog.h"
|
#include "FileActionDialog.h"
|
||||||
#include "ui_FileActionDialog.h"
|
#include "ui_FileActionDialog.h"
|
||||||
|
|
||||||
FileActionDialog::FileActionDialog(const QString &title, const QString &message, const QStringList &files, QWidget *parent) :
|
FileActionDialog::FileActionDialog(QWidget *parent, const QString &title, const QString &message, const QStringList &files, const QString &checkBoxText, bool *checkBoxResult) :
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
ui(new Ui::FileActionDialog)
|
ui(new Ui::FileActionDialog)
|
||||||
{
|
{
|
||||||
@ -10,6 +10,17 @@ FileActionDialog::FileActionDialog(const QString &title, const QString &message,
|
|||||||
ui->label->setText(message);
|
ui->label->setText(message);
|
||||||
ui->listView->setModel(&itemModel);
|
ui->listView->setModel(&itemModel);
|
||||||
|
|
||||||
|
if(!checkBoxText.isEmpty() && checkBoxResult)
|
||||||
|
{
|
||||||
|
checkBox = new QCheckBox(this);
|
||||||
|
checkBox->setText(checkBoxText);
|
||||||
|
checkBox->setEnabled(true);
|
||||||
|
checkBox->setChecked(*checkBoxResult);
|
||||||
|
this->checkBoxResult = checkBoxResult;
|
||||||
|
ui->verticalLayout->insertWidget(2, checkBox);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
for(QStringList::const_iterator it=files.begin(); it!=files.end(); ++it)
|
for(QStringList::const_iterator it=files.begin(); it!=files.end(); ++it)
|
||||||
itemModel.appendRow(new QStandardItem(*it));
|
itemModel.appendRow(new QStandardItem(*it));
|
||||||
}
|
}
|
||||||
@ -19,10 +30,13 @@ FileActionDialog::~FileActionDialog()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FileActionDialog::run(const QString &title, const QString &message, const QStringList &files, QWidget *parent)
|
bool FileActionDialog::run(QWidget *parent, const QString &title, const QString &message, const QStringList &files, const QString &checkBoxText, bool *checkBoxResult)
|
||||||
{
|
{
|
||||||
FileActionDialog dlg(title, message, files, parent);
|
FileActionDialog dlg(parent, title, message, files, checkBoxText, checkBoxResult);
|
||||||
int res = dlg.exec();
|
int res = dlg.exec();
|
||||||
|
|
||||||
|
if(!checkBoxText.isEmpty() && checkBoxResult && dlg.checkBox)
|
||||||
|
*checkBoxResult = dlg.checkBox->isChecked();
|
||||||
|
|
||||||
return res == QDialog::Accepted;
|
return res == QDialog::Accepted;
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include <QStandardItemModel>
|
#include <QStandardItemModel>
|
||||||
|
#include <QCheckBox>
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class FileActionDialog;
|
class FileActionDialog;
|
||||||
@ -13,14 +14,16 @@ class FileActionDialog : public QDialog
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit FileActionDialog(const QString &title, const QString &message, const QStringList &files, QWidget *parent = 0);
|
explicit FileActionDialog(QWidget *parent, const QString &title, const QString &message, const QStringList &files, const QString &checkBoxText=QString(), bool *checkBoxResult=0);
|
||||||
~FileActionDialog();
|
~FileActionDialog();
|
||||||
|
|
||||||
static bool run(const QString &title, const QString &message, const QStringList &files, QWidget *parent);
|
static bool run(QWidget *parent, const QString &title, const QString &message, const QStringList &files, const QString &checkBoxText=QString(), bool *checkBoxResult=0);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::FileActionDialog *ui;
|
Ui::FileActionDialog *ui;
|
||||||
QStandardItemModel itemModel;
|
QStandardItemModel itemModel;
|
||||||
|
QCheckBox *checkBox;
|
||||||
|
bool *checkBoxResult;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // FILEACTIONDIALOG_H
|
#endif // FILEACTIONDIALOG_H
|
||||||
|
210
MainWindow.cpp
210
MainWindow.cpp
@ -10,15 +10,14 @@
|
|||||||
#include <QTemporaryFile>
|
#include <QTemporaryFile>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
|
#include <QInputDialog>
|
||||||
#include "CommitDialog.h"
|
#include "CommitDialog.h"
|
||||||
#include "FileActionDialog.h"
|
#include "FileActionDialog.h"
|
||||||
|
|
||||||
#define SILENT_STATUS true
|
#define SILENT_STATUS true
|
||||||
#define COUNTOF(array) (sizeof(array)/sizeof(array[0]))
|
#define COUNTOF(array) (sizeof(array)/sizeof(array[0]))
|
||||||
|
|
||||||
#define DEV_SETTINGS
|
//#define DEV_SETTINGS
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
@ -88,6 +87,12 @@ MainWindow::~MainWindow()
|
|||||||
#endif
|
#endif
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
const QString &MainWindow::getCurrentWorkspace()
|
||||||
|
{
|
||||||
|
Q_ASSERT(currentWorkspace<workspaces.size());
|
||||||
|
Q_ASSERT(QDir(workspaces[currentWorkspace]).exists());
|
||||||
|
return workspaces[currentWorkspace];
|
||||||
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_actionRefresh_triggered()
|
void MainWindow::on_actionRefresh_triggered()
|
||||||
@ -104,6 +109,7 @@ void MainWindow::on_actionOpen_triggered()
|
|||||||
workspaces.append(path);
|
workspaces.append(path);
|
||||||
currentWorkspace = workspaces.size()-1;
|
currentWorkspace = workspaces.size()-1;
|
||||||
on_actionClearLog_triggered();
|
on_actionClearLog_triggered();
|
||||||
|
stopUI();
|
||||||
refresh();
|
refresh();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -217,20 +223,41 @@ void MainWindow::scanWorkspace()
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
QString status_text = line.left(10).trimmed();
|
QString status_text = line.left(10).trimmed();
|
||||||
|
QString fname = line.right(line.length() - 10).trimmed();
|
||||||
FileEntry::EntryType type = FileEntry::TYPE_UNKNOWN;
|
FileEntry::EntryType type = FileEntry::TYPE_UNKNOWN;
|
||||||
|
|
||||||
|
bool add_missing = false;
|
||||||
|
|
||||||
if(status_text=="EDITED")
|
if(status_text=="EDITED")
|
||||||
type = FileEntry::TYPE_EDITTED;
|
type = FileEntry::TYPE_EDITTED;
|
||||||
if(status_text=="ADDED")
|
else if(status_text=="ADDED")
|
||||||
type = FileEntry::TYPE_ADDED;
|
type = FileEntry::TYPE_ADDED;
|
||||||
if(status_text=="DELETED")
|
else if(status_text=="DELETED")
|
||||||
|
{
|
||||||
type = FileEntry::TYPE_DELETED;
|
type = FileEntry::TYPE_DELETED;
|
||||||
|
add_missing = true;
|
||||||
|
}
|
||||||
|
else if(status_text=="MISSING")
|
||||||
|
{
|
||||||
|
type = FileEntry::TYPE_MISSING;
|
||||||
|
add_missing = true;
|
||||||
|
}
|
||||||
|
else if(status_text=="RENAMED")
|
||||||
|
type = FileEntry::TYPE_RENAMED;
|
||||||
else if(status_text=="UNCHANGED")
|
else if(status_text=="UNCHANGED")
|
||||||
type = FileEntry::TYPE_UNCHANGED;
|
type = FileEntry::TYPE_UNCHANGED;
|
||||||
|
|
||||||
QString fname = line.right(line.length() - 10).trimmed();
|
|
||||||
|
|
||||||
filemap_t::iterator it = workspaceFiles.find(fname);
|
filemap_t::iterator it = workspaceFiles.find(fname);
|
||||||
|
|
||||||
|
if(add_missing && it==workspaceFiles.end())
|
||||||
|
{
|
||||||
|
FileEntry e;
|
||||||
|
QFileInfo info(wkdir+QDir::separator()+fname);
|
||||||
|
e.set(info, type, wkdir);
|
||||||
|
workspaceFiles.insert(e.getFilename(), e);
|
||||||
|
}
|
||||||
|
|
||||||
|
it = workspaceFiles.find(fname);
|
||||||
Q_ASSERT(it!=workspaceFiles.end());
|
Q_ASSERT(it!=workspaceFiles.end());
|
||||||
|
|
||||||
it.value().setType(type);
|
it.value().setType(type);
|
||||||
@ -240,13 +267,14 @@ void MainWindow::scanWorkspace()
|
|||||||
// Clear all rows (except header)
|
// Clear all rows (except header)
|
||||||
itemModel.removeRows(0, itemModel.rowCount());
|
itemModel.removeRows(0, itemModel.rowCount());
|
||||||
|
|
||||||
struct { FileEntry::EntryType type; const char *tag; const char *icon; }
|
struct { FileEntry::EntryType type; const char *tag; const char *tooltip; const char *icon; }
|
||||||
stats[]=
|
stats[] = {
|
||||||
{
|
{ FileEntry::TYPE_EDITTED, "E", "Editted", ":icons/icons/Button Blank Yellow-01.png" },
|
||||||
{ FileEntry::TYPE_EDITTED, "E", ":icons/icons/Button Blank Yellow-01.png" },
|
{ FileEntry::TYPE_UNCHANGED, "U", "Unchanged", ":icons/icons/Button Blank Green-01.png" },
|
||||||
{ FileEntry::TYPE_UNCHANGED, "U", ":icons/icons/Button Blank Green-01.png" },
|
{ FileEntry::TYPE_ADDED, "A", "Added", ":icons/icons/Button Add-01.png" },
|
||||||
{ FileEntry::TYPE_ADDED, "A", ":icons/icons/Button Add-01.png" },
|
{ FileEntry::TYPE_DELETED, "D", "Deleted", ":icons/icons/Button Close-01.png" },
|
||||||
{ FileEntry::TYPE_DELETED, "D", ":icons/icons/Button Close-01.png" },
|
{ FileEntry::TYPE_RENAMED, "R", "Renamed", ":icons/icons/Button Reload-01.png" },
|
||||||
|
{ FileEntry::TYPE_MISSING, "M", "Missing", ":icons/icons/Button Help-01.png" },
|
||||||
};
|
};
|
||||||
|
|
||||||
size_t i=0;
|
size_t i=0;
|
||||||
@ -256,6 +284,7 @@ void MainWindow::scanWorkspace()
|
|||||||
|
|
||||||
// Status Column
|
// Status Column
|
||||||
const char *tag = "?"; // Default Tag
|
const char *tag = "?"; // Default Tag
|
||||||
|
const char *tooltip = "Unknown";
|
||||||
const char *icon = ":icons/icons/Button Blank Gray-01.png"; // Default icon
|
const char *icon = ":icons/icons/Button Blank Gray-01.png"; // Default icon
|
||||||
|
|
||||||
for(size_t t=0; t<COUNTOF(stats); ++t)
|
for(size_t t=0; t<COUNTOF(stats); ++t)
|
||||||
@ -263,12 +292,15 @@ void MainWindow::scanWorkspace()
|
|||||||
if(e.getType() == stats[t].type)
|
if(e.getType() == stats[t].type)
|
||||||
{
|
{
|
||||||
tag = stats[t].tag;
|
tag = stats[t].tag;
|
||||||
|
tooltip = stats[t].tooltip;
|
||||||
icon = stats[t].icon;
|
icon = stats[t].icon;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
itemModel.setItem(i, COLUMN_STATUS, new QStandardItem(QIcon(icon), tag));
|
QStandardItem *status = new QStandardItem(QIcon(icon), tag);
|
||||||
|
status->setToolTip(tooltip);
|
||||||
|
itemModel.setItem(i, COLUMN_STATUS, status);
|
||||||
|
|
||||||
QString path = e.getFilename();
|
QString path = e.getFilename();
|
||||||
path = path.left(path.indexOf(e.getFileInfo().fileName()));
|
path = path.left(path.indexOf(e.getFileInfo().fileName()));
|
||||||
@ -347,10 +379,10 @@ void MainWindow::on_actionClearLog_triggered()
|
|||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
bool MainWindow::runFossil(QStringList &result, const QStringList &args, bool silent)
|
bool MainWindow::runFossil(QStringList &result, const QStringList &args, bool silent, bool detached)
|
||||||
{
|
{
|
||||||
int exit_code = EXIT_FAILURE;
|
int exit_code = EXIT_FAILURE;
|
||||||
if(!runFossil(result, args, exit_code, silent))
|
if(!runFossil(result, args, exit_code, silent, detached))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return exit_code == EXIT_SUCCESS;
|
return exit_code == EXIT_SUCCESS;
|
||||||
@ -358,17 +390,22 @@ bool MainWindow::runFossil(QStringList &result, const QStringList &args, bool si
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// Run fossil. Returns true if execution was succesfull regardless if fossil
|
// Run fossil. Returns true if execution was succesfull regardless if fossil
|
||||||
// issued an error
|
// issued an error
|
||||||
bool MainWindow::runFossil(QStringList &result, const QStringList &args, int &exitCode, bool silent)
|
bool MainWindow::runFossil(QStringList &result, const QStringList &args, int &exitCode, bool silent, bool detached)
|
||||||
{
|
{
|
||||||
QProcess process(this);
|
|
||||||
|
|
||||||
process.setProcessChannelMode(QProcess::MergedChannels);
|
|
||||||
QString wkdir = getCurrentWorkspace();
|
|
||||||
process.setWorkingDirectory(wkdir);
|
|
||||||
|
|
||||||
if(!silent)
|
if(!silent)
|
||||||
log("> fossil "+args.join(" ")+"\n");
|
log("> fossil "+args.join(" ")+"\n");
|
||||||
|
|
||||||
|
QString wkdir = getCurrentWorkspace();
|
||||||
|
|
||||||
|
if(detached)
|
||||||
|
{
|
||||||
|
return QProcess::startDetached(fossilPath, args, wkdir);
|
||||||
|
}
|
||||||
|
|
||||||
|
QProcess process(this);
|
||||||
|
process.setProcessChannelMode(QProcess::MergedChannels);
|
||||||
|
process.setWorkingDirectory(wkdir);
|
||||||
|
|
||||||
process.start(fossilPath, args);
|
process.start(fossilPath, args);
|
||||||
if(!process.waitForStarted())
|
if(!process.waitForStarted())
|
||||||
{
|
{
|
||||||
@ -401,7 +438,8 @@ bool MainWindow::runFossil(QStringList &result, const QStringList &args, int &ex
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::addWorkspace(const QString &dir)
|
void MainWindow::addWorkspace(const QString &dir)
|
||||||
{
|
{
|
||||||
workspaces.append(dir);
|
QDir d(dir);
|
||||||
|
workspaces.append(d.absolutePath());
|
||||||
currentWorkspace = workspaces.size()-1;
|
currentWorkspace = workspaces.size()-1;
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
@ -503,18 +541,24 @@ void MainWindow::getSelectionFilenames(QStringList &filenames, int includeMask,
|
|||||||
filenames.append(filename);
|
filenames.append(filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
bool MainWindow::diffFile(QString repoFile)
|
||||||
|
{
|
||||||
|
QStringList res;
|
||||||
|
int exitcode;
|
||||||
|
// Run the diff detached
|
||||||
|
return runFossil(res, QStringList() << "gdiff" << QuotePath(repoFile), exitcode, false, true);
|
||||||
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_actionDiff_triggered()
|
void MainWindow::on_actionDiff_triggered()
|
||||||
{
|
{
|
||||||
QStringList selection;
|
QStringList selection;
|
||||||
getSelectionFilenames(selection);
|
getSelectionFilenames(selection, FileEntry::TYPE_REPO);
|
||||||
|
|
||||||
for(QStringList::iterator it = selection.begin(); it!=selection.end(); ++it)
|
for(QStringList::iterator it = selection.begin(); it!=selection.end(); ++it)
|
||||||
{
|
if(!diffFile(*it))
|
||||||
QStringList res;
|
|
||||||
if(!runFossil(res, QStringList() << "gdiff" << QuotePath(*it)))
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
@ -632,7 +676,7 @@ void MainWindow::on_actionCommit_triggered()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
QString msg;
|
QString msg;
|
||||||
if(!CommitDialog::run(msg, commitMessages, modified_files, this))
|
if(!CommitDialog::run(this, msg, commitMessages, modified_files))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Do commit
|
// Do commit
|
||||||
@ -661,7 +705,7 @@ void MainWindow::on_actionAdd_triggered()
|
|||||||
if(selection.empty())
|
if(selection.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(!FileActionDialog::run(tr("Add files"), tr("The following files will be added. Are you sure?"), selection, this))
|
if(!FileActionDialog::run(this, tr("Add files"), tr("The following files will be added. Are you sure?"), selection))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Do Add
|
// Do Add
|
||||||
@ -680,15 +724,33 @@ void MainWindow::on_actionDelete_triggered()
|
|||||||
QStringList unknown_files;
|
QStringList unknown_files;
|
||||||
getSelectionFilenames(unknown_files, FileEntry::TYPE_UNKNOWN);
|
getSelectionFilenames(unknown_files, FileEntry::TYPE_UNKNOWN);
|
||||||
|
|
||||||
if(repo_files.empty() && unknown_files.empty())
|
QStringList all_files = repo_files+unknown_files;
|
||||||
|
|
||||||
|
if(all_files.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(!FileActionDialog::run(tr("Delete files"), tr("The following files will be deleted. Are you sure?"), repo_files+unknown_files, this))
|
bool remove_local = false;
|
||||||
|
|
||||||
|
if(!FileActionDialog::run(this, tr("Remove files"), tr("The following files will be removed from the repository.\nAre you sure?"), all_files, tr("Also delete the local files"), &remove_local ))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if(!repo_files.empty())
|
||||||
|
{
|
||||||
// Do Delete
|
// Do Delete
|
||||||
QStringList res;
|
QStringList res;
|
||||||
runFossil(res, QStringList() << "delete" << QuotePaths(repo_files) );
|
if(!runFossil(res, QStringList() << "delete" << QuotePaths(repo_files)))
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(remove_local)
|
||||||
|
{
|
||||||
|
for(int i=0; i<all_files.size(); ++i)
|
||||||
|
{
|
||||||
|
QFileInfo fi(getCurrentWorkspace() + QDir::separator() + all_files[i]);
|
||||||
|
Q_ASSERT(fi.exists());
|
||||||
|
QFile::remove(fi.filePath());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
refresh();
|
refresh();
|
||||||
}
|
}
|
||||||
@ -697,12 +759,12 @@ void MainWindow::on_actionDelete_triggered()
|
|||||||
void MainWindow::on_actionRevert_triggered()
|
void MainWindow::on_actionRevert_triggered()
|
||||||
{
|
{
|
||||||
QStringList modified_files;
|
QStringList modified_files;
|
||||||
getSelectionFilenames(modified_files, FileEntry::TYPE_ADDED|FileEntry::TYPE_EDITTED);
|
getSelectionFilenames(modified_files, FileEntry::TYPE_EDITTED|FileEntry::TYPE_DELETED|FileEntry::TYPE_MISSING);
|
||||||
|
|
||||||
if(modified_files.empty())
|
if(modified_files.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(!FileActionDialog::run(tr("Revert files"), tr("The following files will be reverted. Are you sure?"), modified_files, this))
|
if(!FileActionDialog::run(this, tr("Revert files"), tr("The following files will be reverted. Are you sure?"), modified_files))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Do Revert
|
// Do Revert
|
||||||
@ -712,6 +774,42 @@ void MainWindow::on_actionRevert_triggered()
|
|||||||
refresh();
|
refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
void MainWindow::on_actionRename_triggered()
|
||||||
|
{
|
||||||
|
QStringList repo_files;
|
||||||
|
getSelectionFilenames(repo_files, FileEntry::TYPE_REPO);
|
||||||
|
|
||||||
|
if(repo_files.length()!=1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
QFileInfo fi_before(repo_files[0]);
|
||||||
|
|
||||||
|
bool ok = false;
|
||||||
|
QString new_name = QInputDialog::getText(this, tr("Rename"), tr("Enter new name"), QLineEdit::Normal, fi_before.filePath(), &ok );
|
||||||
|
if(!ok)
|
||||||
|
return;
|
||||||
|
|
||||||
|
QFileInfo fi_after(new_name);
|
||||||
|
|
||||||
|
if(fi_after.exists())
|
||||||
|
{
|
||||||
|
QMessageBox::critical(this, tr("Error"), tr("File ")+new_name+tr(" already exists.\nRename aborted."), QMessageBox::Ok );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Do Rename
|
||||||
|
QStringList res;
|
||||||
|
runFossil(res, QStringList() << "mv" << QuotePath(fi_before.filePath()) << QuotePath(fi_after.filePath()) );
|
||||||
|
|
||||||
|
QString wkdir = getCurrentWorkspace() + QDir::separator();
|
||||||
|
|
||||||
|
// Also rename the file
|
||||||
|
QFile::rename( wkdir+fi_before.filePath(), wkdir+fi_after.filePath());
|
||||||
|
|
||||||
|
refresh();
|
||||||
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_actionNew_triggered()
|
void MainWindow::on_actionNew_triggered()
|
||||||
{
|
{
|
||||||
@ -732,6 +830,7 @@ void MainWindow::on_actionNew_triggered()
|
|||||||
QMessageBox::critical(this, tr("Error"), tr("A repository file already exists.\nRepository creation aborted."), QMessageBox::Ok );
|
QMessageBox::critical(this, tr("Error"), tr("A repository file already exists.\nRepository creation aborted."), QMessageBox::Ok );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
stopUI();
|
||||||
|
|
||||||
QFileInfo path_info(path);
|
QFileInfo path_info(path);
|
||||||
Q_ASSERT(path_info.dir().exists());
|
Q_ASSERT(path_info.dir().exists());
|
||||||
@ -753,17 +852,15 @@ void MainWindow::on_actionNew_triggered()
|
|||||||
QMessageBox::critical(this, tr("Error"), tr("Repository checkout failed."), QMessageBox::Ok );
|
QMessageBox::critical(this, tr("Error"), tr("Repository checkout failed."), QMessageBox::Ok );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
refresh();
|
refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_actionClone_triggered()
|
void MainWindow::on_actionClone_triggered()
|
||||||
{
|
{
|
||||||
|
stopUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_actionOpenContaining_triggered()
|
void MainWindow::on_actionOpenContaining_triggered()
|
||||||
{
|
{
|
||||||
@ -783,3 +880,36 @@ void MainWindow::on_actionOpenContaining_triggered()
|
|||||||
QUrl url = QUrl::fromLocalFile(target);
|
QUrl url = QUrl::fromLocalFile(target);
|
||||||
QDesktopServices::openUrl(url);
|
QDesktopServices::openUrl(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
void MainWindow::on_actionUndo_triggered()
|
||||||
|
{
|
||||||
|
// Gather Undo actions
|
||||||
|
QStringList res;
|
||||||
|
|
||||||
|
if(!runFossil(res, QStringList() << "undo" << "--explain" ))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if(res.length()>0 && res[0]=="No undo or redo is available")
|
||||||
|
return;
|
||||||
|
|
||||||
|
if(!FileActionDialog::run(this, tr("Undo"), tr("The following actions will be undone. Are you sure?"), res))
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Do Undo
|
||||||
|
runFossil(res, QStringList() << "undo" );
|
||||||
|
|
||||||
|
refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
void MainWindow::on_actionAbout_triggered()
|
||||||
|
{
|
||||||
|
QMessageBox::about(this, tr("About..."), tr(
|
||||||
|
"Fuel, a GUI frontend to Fossil SCM\n"
|
||||||
|
"by Kostas Karanikolas\n"
|
||||||
|
"Released under the GNU GPL\n\n"
|
||||||
|
"Icon-set by Deleket - Jojo Mendoza\n"
|
||||||
|
"Available under the CC Attribution-Noncommercial-No Derivate 3.0 License"));
|
||||||
|
}
|
||||||
|
|
||||||
|
16
MainWindow.h
16
MainWindow.h
@ -24,7 +24,9 @@ struct FileEntry
|
|||||||
TYPE_EDITTED = 1<<2,
|
TYPE_EDITTED = 1<<2,
|
||||||
TYPE_ADDED = 1<<3,
|
TYPE_ADDED = 1<<3,
|
||||||
TYPE_DELETED = 1<<4,
|
TYPE_DELETED = 1<<4,
|
||||||
TYPE_REPO_MODIFIED = TYPE_EDITTED|TYPE_ADDED|TYPE_DELETED,
|
TYPE_MISSING = 1<<5,
|
||||||
|
TYPE_RENAMED = 1<<6,
|
||||||
|
TYPE_REPO_MODIFIED = TYPE_EDITTED|TYPE_ADDED|TYPE_DELETED|TYPE_MISSING|TYPE_RENAMED,
|
||||||
TYPE_REPO = TYPE_UNCHANGED|TYPE_REPO_MODIFIED,
|
TYPE_REPO = TYPE_UNCHANGED|TYPE_REPO_MODIFIED,
|
||||||
TYPE_ALL = TYPE_UNKNOWN|TYPE_REPO
|
TYPE_ALL = TYPE_UNKNOWN|TYPE_REPO
|
||||||
};
|
};
|
||||||
@ -93,15 +95,16 @@ class MainWindow : public QMainWindow
|
|||||||
public:
|
public:
|
||||||
explicit MainWindow(QWidget *parent = 0);
|
explicit MainWindow(QWidget *parent = 0);
|
||||||
~MainWindow();
|
~MainWindow();
|
||||||
|
bool diffFile(QString repoFile);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void refresh();
|
void refresh();
|
||||||
void scanWorkspace();
|
void scanWorkspace();
|
||||||
bool runFossil(QStringList &result, const QStringList &args, bool silent=false);
|
bool runFossil(QStringList &result, const QStringList &args, bool silent=false, bool detached=false);
|
||||||
bool runFossil(QStringList &result, const QStringList &args, int &exitCode, bool silent=false);
|
bool runFossil(QStringList &result, const QStringList &args, int &exitCode, bool silent=false, bool detached=false);
|
||||||
void loadSettings();
|
void loadSettings();
|
||||||
void saveSettings();
|
void saveSettings();
|
||||||
const QString &getCurrentWorkspace() { Q_ASSERT(currentWorkspace<workspaces.size()); return workspaces[currentWorkspace]; }
|
const QString &getCurrentWorkspace();
|
||||||
void log(const QString &text);
|
void log(const QString &text);
|
||||||
void setStatus(const QString &text);
|
void setStatus(const QString &text);
|
||||||
bool uiRunning() const { return fossilUI.state() == QProcess::Running; }
|
bool uiRunning() const { return fossilUI.state() == QProcess::Running; }
|
||||||
@ -139,9 +142,10 @@ private slots:
|
|||||||
void on_actionRevert_triggered();
|
void on_actionRevert_triggered();
|
||||||
void on_actionNew_triggered();
|
void on_actionNew_triggered();
|
||||||
void on_actionClone_triggered();
|
void on_actionClone_triggered();
|
||||||
|
|
||||||
void on_actionOpenContaining_triggered();
|
void on_actionOpenContaining_triggered();
|
||||||
|
void on_actionRename_triggered();
|
||||||
|
void on_actionUndo_triggered();
|
||||||
|
void on_actionAbout_triggered();
|
||||||
private:
|
private:
|
||||||
Ui::MainWindow *ui;
|
Ui::MainWindow *ui;
|
||||||
QStandardItemModel itemModel;
|
QStandardItemModel itemModel;
|
||||||
|
@ -13,6 +13,10 @@
|
|||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Fuel</string>
|
<string>Fuel</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="windowIcon">
|
||||||
|
<iconset resource="resources.qrc">
|
||||||
|
<normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
|
||||||
|
</property>
|
||||||
<widget class="QWidget" name="centralWidget">
|
<widget class="QWidget" name="centralWidget">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<property name="margin">
|
<property name="margin">
|
||||||
@ -97,7 +101,14 @@
|
|||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionQuit"/>
|
<addaction name="actionQuit"/>
|
||||||
</widget>
|
</widget>
|
||||||
|
<widget class="QMenu" name="menuHelp">
|
||||||
|
<property name="title">
|
||||||
|
<string>Help</string>
|
||||||
|
</property>
|
||||||
|
<addaction name="actionAbout"/>
|
||||||
|
</widget>
|
||||||
<addaction name="menuFile"/>
|
<addaction name="menuFile"/>
|
||||||
|
<addaction name="menuHelp"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QToolBar" name="mainToolBar">
|
<widget class="QToolBar" name="mainToolBar">
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
@ -125,8 +136,9 @@
|
|||||||
<addaction name="actionPush"/>
|
<addaction name="actionPush"/>
|
||||||
<addaction name="actionPull"/>
|
<addaction name="actionPull"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
|
<addaction name="actionUndo"/>
|
||||||
|
<addaction name="separator"/>
|
||||||
<addaction name="actionAdd"/>
|
<addaction name="actionAdd"/>
|
||||||
<addaction name="actionRename"/>
|
|
||||||
<addaction name="actionRevert"/>
|
<addaction name="actionRevert"/>
|
||||||
<addaction name="actionDelete"/>
|
<addaction name="actionDelete"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
@ -138,6 +150,7 @@
|
|||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionOpenContaining"/>
|
<addaction name="actionOpenContaining"/>
|
||||||
<addaction name="actionClearLog"/>
|
<addaction name="actionClearLog"/>
|
||||||
|
<addaction name="separator"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QStatusBar" name="statusBar"/>
|
<widget class="QStatusBar" name="statusBar"/>
|
||||||
<action name="actionRefresh">
|
<action name="actionRefresh">
|
||||||
@ -303,6 +316,10 @@
|
|||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionOpenFile">
|
<action name="actionOpenFile">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="resources.qrc">
|
||||||
|
<normaloff>:/icons/icons/Document-01.png</normaloff>:/icons/icons/Document-01.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open file</string>
|
<string>Open file</string>
|
||||||
</property>
|
</property>
|
||||||
@ -334,6 +351,20 @@
|
|||||||
<string>Open Containing Folder</string>
|
<string>Open Containing Folder</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="actionUndo">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="resources.qrc">
|
||||||
|
<normaloff>:/icons/icons/Button Reload-01.png</normaloff>:/icons/icons/Button Reload-01.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>undo</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
<action name="actionAbout">
|
||||||
|
<property name="text">
|
||||||
|
<string>About...</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<layoutdefault spacing="6" margin="11"/>
|
<layoutdefault spacing="6" margin="11"/>
|
||||||
<resources>
|
<resources>
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 28 KiB |
@ -1 +1,3 @@
|
|||||||
http://www.iconarchive.com/show/soft-scraps-icons-by-deleket.3.html
|
http://www.iconarchive.com/show/soft-scraps-icons-by-deleket.3.html
|
||||||
|
http://www.iconarchive.com/artist/deleket.html
|
||||||
|
http://www.deleket.com/
|
||||||
|
31
manifest
31
manifest
@ -1,14 +1,14 @@
|
|||||||
C Implemented\sCommitAction,\sDeleteAction,\sRevertAction,\sNewRepository,\sOpenRepository\nNew\sAction:\sOpen\scontaining\sfolder\nNew\sfiletypes\sADDED,\sDELETED\nWe\snow\sdetect\sinvalid\sor\soutdated\srepositories\n
|
C Commit\sDialog:\n-\sCommit\smessages\smust\snot\sbe\sempty\n-\sDouble-clicking\sa\sfile\sinvokes\sdiff\nFileAction\sDialog:\n-\sOptional\scheckbox\n\nMainWindow:\n-\sAdded\sRename/Undo/About\sActions\n-\sAdded\sRenamed/Missing\sfile\sstates\n-\sAdded\stooltips\sto\sstatus\scolumn\n-\sSupport\sfor\srunning\sfossil\sin\sdetached\smode\s(to\sprevent\skilling\sfossil\sdue\sto\stimeout\son\sdiff\ssessions)\n
|
||||||
D 2011-08-04T15:52:07.126
|
D 2011-08-05T15:25:38.965
|
||||||
F CommitDialog.cpp f4065a49dfaa6904ffb1ad4ebe5efd01506cf550
|
F CommitDialog.cpp c2a14598f42d252d847d05b3bb33ae040f1a31ae
|
||||||
F CommitDialog.h c18c73998f8a925723ec1407ce75dc17a27a5ff7
|
F CommitDialog.h 0550b1b652924ae54b6f6c9274cad2d4c491808a
|
||||||
F CommitDialog.ui 482961858d1e7c31745966c347b21b6318e2e7b5
|
F CommitDialog.ui 4a641325b8645f07672ffb9f19e7134ab753e6bb
|
||||||
F FileActionDialog.cpp 02dc244b0bcaad2021327186d5870bc408210a41
|
F FileActionDialog.cpp 6410dc7a65209df1839f871b3b66c0a78a4fe733
|
||||||
F FileActionDialog.h 6082f84f6b5d48be6104034d6dc896a9d343b613
|
F FileActionDialog.h 873a9f720753a37d67071563ed7954f91b0d4699
|
||||||
F FileActionDialog.ui 2d7a0fa47f9555f4a4a7485feacd5bce504415a0
|
F FileActionDialog.ui 2d7a0fa47f9555f4a4a7485feacd5bce504415a0
|
||||||
F MainWindow.cpp f8433657efea2e502d790b6d094891aaee1134c5
|
F MainWindow.cpp b0e2b8915337e3759229ead372097a5b26906dca
|
||||||
F MainWindow.h f193166dbdafd922ba6513f16a6d12bda09a8ffc
|
F MainWindow.h 0d6d8fb35f3a8763f7d4b78f809a39ad47e80047
|
||||||
F MainWindow.ui 6f445eb6b5d58e54050d255420b6eac005a81eeb
|
F MainWindow.ui f986ff746d7a111ddf82b1dc537aad891c11e9cc
|
||||||
F RepoDialog.cpp 8f20e1511526973555c774350ec413dcecf51c9e
|
F RepoDialog.cpp 8f20e1511526973555c774350ec413dcecf51c9e
|
||||||
F RepoDialog.h a958c5f98f1e6882bf41dbdd2e4df3cb89700802
|
F RepoDialog.h a958c5f98f1e6882bf41dbdd2e4df3cb89700802
|
||||||
F RepoDialog.ui 8fe9b7f7528332ca9a45e919cf116aaf144a3286
|
F RepoDialog.ui 8fe9b7f7528332ca9a45e919cf116aaf144a3286
|
||||||
@ -76,7 +76,7 @@ F icons/Document\sOrganization\sChart-01.png 08e2d90232609a6537ff27c2fcbaf8669d2
|
|||||||
F icons/Document\sPreview-01.png 6dad0c2b3796f79b9ca2afeda35a4a25b2bf1a93
|
F icons/Document\sPreview-01.png 6dad0c2b3796f79b9ca2afeda35a4a25b2bf1a93
|
||||||
F icons/Document\sText-01.png d2032f213666611e1f2ac3c6d3bbd5ac3cb70c4e
|
F icons/Document\sText-01.png d2032f213666611e1f2ac3c6d3bbd5ac3cb70c4e
|
||||||
F icons/Document-01.png 5caa3fb0c2803a5824967b772e221b8a6bf81888
|
F icons/Document-01.png 5caa3fb0c2803a5824967b772e221b8a6bf81888
|
||||||
F icons/Document-Revert-icon.png c696a41d43d08c99a726cb8af97601b825a9fb34
|
F icons/Document-Revert-icon.png e0b9cdfe17a0f5f56fea52f129adb99e99d3013a
|
||||||
F icons/Edit\sDocument-01.png f83318cc0406ec8404162c6fd90bdb87ffd953d2
|
F icons/Edit\sDocument-01.png f83318cc0406ec8404162c6fd90bdb87ffd953d2
|
||||||
F icons/Email\sAttachment-01.png 9140f252ce29af0f3ca8f8b9438bc5fd73084627
|
F icons/Email\sAttachment-01.png 9140f252ce29af0f3ca8f8b9438bc5fd73084627
|
||||||
F icons/Email\sDelete-01.png 6f7f1f536dcedf8e560a688e10be05c8f292f481
|
F icons/Email\sDelete-01.png 6f7f1f536dcedf8e560a688e10be05c8f292f481
|
||||||
@ -116,7 +116,7 @@ F icons/Gear-01.png dd9d2f1b3eaefd2b376547e8d7dc0224b142fb79
|
|||||||
F icons/Highlighter\sBlue-01.png f13cd5ab2131e0405e6cca65c9bf859ddeac7dca
|
F icons/Highlighter\sBlue-01.png f13cd5ab2131e0405e6cca65c9bf859ddeac7dca
|
||||||
F icons/Highlighter\sGreen-01.png c27855873f1603692ddec1fe5eb387d82dec4511
|
F icons/Highlighter\sGreen-01.png c27855873f1603692ddec1fe5eb387d82dec4511
|
||||||
F icons/Highlighter\sYellow-01.png 50c25fe8857e04ccbe7d518abc8e50cad64e82da
|
F icons/Highlighter\sYellow-01.png 50c25fe8857e04ccbe7d518abc8e50cad64e82da
|
||||||
F icons/IconCredits.txt cee343f48fa15458897693df78193c0f7c63a519
|
F icons/IconCredits.txt e38bd317b7d007b1bffb910f543dbbd376b2b16a
|
||||||
F icons/Image\sBMP-01.png 79a0ca5cd1a794b711c37a3ab9a9d45d458c6cd1
|
F icons/Image\sBMP-01.png 79a0ca5cd1a794b711c37a3ab9a9d45d458c6cd1
|
||||||
F icons/Image\sGIF-01.png d409ac6dfeceac46d711cc7bef274d94bbd4e9b0
|
F icons/Image\sGIF-01.png d409ac6dfeceac46d711cc7bef274d94bbd4e9b0
|
||||||
F icons/Image\sJPEG-01.png 63bc765c3c2c389c580faa66c7802f8d18e2ddd7
|
F icons/Image\sJPEG-01.png 63bc765c3c2c389c580faa66c7802f8d18e2ddd7
|
||||||
@ -166,9 +166,8 @@ F icons/Zoom\sOut-01.png 8eda092100d9e00c9097f43a80d1e26695947448
|
|||||||
F icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6
|
F icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6
|
||||||
F main.cpp f53e9e1e34f65565f06b2d37d7be5c38e2113a03
|
F main.cpp f53e9e1e34f65565f06b2d37d7be5c38e2113a03
|
||||||
F qtfossil.pro 047d5e691c772ef110e4eaef75ddba39a0142544
|
F qtfossil.pro 047d5e691c772ef110e4eaef75ddba39a0142544
|
||||||
F qtfossil.pro.user 46795d72c37bdb7016c9673180cecb5264713f50
|
|
||||||
F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
|
F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
|
||||||
P 9e35495cc3f4e18f458cf02f83d1d8075c0a85b9
|
P 2ac3cf9717f3529f809ffde1e802295988dfda05
|
||||||
R 59296ed5593ab777a8dc300eeb4e43dc
|
R 3b0d0d13b7cf9d3ea4f672b4d52f7f24
|
||||||
U kostas
|
U kostas
|
||||||
Z 301a78f530bab5b00a799f65640fa487
|
Z 8f7e114d6064ed65232051b27d2d5af2
|
||||||
|
@ -1 +1 @@
|
|||||||
2ac3cf9717f3529f809ffde1e802295988dfda05
|
ea42e7cd8b7041d82e35720b14e30437b6db6e0d
|
@ -1,398 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE QtCreatorProject>
|
|
||||||
<!-- Written by Qt Creator 2.2.82, 2011-08-05T00:47:26. -->
|
|
||||||
<qtcreator>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
|
||||||
<value type="int">0</value>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.EditorSettings</variable>
|
|
||||||
<valuemap type="QVariantMap">
|
|
||||||
<value type="bool" key="EditorConfiguration.AutoIndent">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
|
|
||||||
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
|
|
||||||
<value type="QString" key="language">Cpp</value>
|
|
||||||
<valuemap type="QVariantMap" key="value">
|
|
||||||
<value type="bool" key="AlignAssignments">false</value>
|
|
||||||
<value type="QString" key="CurrentFallback">CppGlobal</value>
|
|
||||||
<value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
|
|
||||||
<value type="bool" key="IndentAccessSpecifiers">false</value>
|
|
||||||
<value type="bool" key="IndentBlockBody">true</value>
|
|
||||||
<value type="bool" key="IndentBlockBraces">false</value>
|
|
||||||
<value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
|
|
||||||
<value type="bool" key="IndentClassBraces">false</value>
|
|
||||||
<value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
|
|
||||||
<value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
|
|
||||||
<value type="bool" key="IndentEnumBraces">false</value>
|
|
||||||
<value type="bool" key="IndentFunctionBody">true</value>
|
|
||||||
<value type="bool" key="IndentFunctionBraces">false</value>
|
|
||||||
<value type="bool" key="IndentNamespaceBody">false</value>
|
|
||||||
<value type="bool" key="IndentNamespaceBraces">false</value>
|
|
||||||
<value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
|
|
||||||
<value type="bool" key="IndentSwitchLabels">false</value>
|
|
||||||
</valuemap>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="EditorConfiguration.CodeStyle.Count">1</value>
|
|
||||||
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
|
|
||||||
<value type="QString" key="EditorConfiguration.CurrentFallback">Global</value>
|
|
||||||
<value type="int" key="EditorConfiguration.IndentSize">4</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
|
|
||||||
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.SmartBackspace">false</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
|
|
||||||
<valuemap type="QVariantMap" key="EditorConfiguration.Tab.0">
|
|
||||||
<value type="QString" key="language">Cpp</value>
|
|
||||||
<valuemap type="QVariantMap" key="value">
|
|
||||||
<value type="bool" key="AutoIndent">true</value>
|
|
||||||
<value type="bool" key="AutoSpacesForTabs">false</value>
|
|
||||||
<value type="QString" key="CurrentFallback">CppGlobal</value>
|
|
||||||
<value type="int" key="IndentSize">4</value>
|
|
||||||
<value type="int" key="PaddingMode">1</value>
|
|
||||||
<value type="bool" key="SmartBackspace">false</value>
|
|
||||||
<value type="bool" key="SpacesForTabs">true</value>
|
|
||||||
<value type="int" key="TabKeyBehavior">0</value>
|
|
||||||
<value type="int" key="TabSize">8</value>
|
|
||||||
</valuemap>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="EditorConfiguration.Tab.1">
|
|
||||||
<value type="QString" key="language">QmlJS</value>
|
|
||||||
<valuemap type="QVariantMap" key="value">
|
|
||||||
<value type="bool" key="AutoIndent">true</value>
|
|
||||||
<value type="bool" key="AutoSpacesForTabs">false</value>
|
|
||||||
<value type="QString" key="CurrentFallback">QmlJSGlobal</value>
|
|
||||||
<value type="int" key="IndentSize">4</value>
|
|
||||||
<value type="int" key="PaddingMode">1</value>
|
|
||||||
<value type="bool" key="SmartBackspace">false</value>
|
|
||||||
<value type="bool" key="SpacesForTabs">true</value>
|
|
||||||
<value type="int" key="TabKeyBehavior">0</value>
|
|
||||||
<value type="int" key="TabSize">8</value>
|
|
||||||
</valuemap>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="EditorConfiguration.Tab.Count">2</value>
|
|
||||||
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
|
|
||||||
<value type="int" key="EditorConfiguration.TabSize">8</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
|
|
||||||
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
|
|
||||||
</valuemap>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.Target.0</variable>
|
|
||||||
<valuemap type="QVariantMap">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
|
|
||||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt in PATH Release</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/kostas/tmp/qtfossil-build-desktop-Qt_in_PATH_Release</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">2</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
|
|
||||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt in PATH Debug</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/kostas/tmp/qtfossil-build-desktop-Qt_in_PATH_Debug</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">2</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
|
|
||||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4.7.0 Release</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/kostas/tmp/qtfossil-build-desktop-4_7_0_Release</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">4</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
|
|
||||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4.7.0 Debug</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/kostas/tmp/qtfossil-build-desktop-4_7_0_Debug</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">4</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">No deployment</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
|
|
||||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
|
|
||||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
|
|
||||||
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
|
|
||||||
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
|
|
||||||
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
|
|
||||||
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
|
|
||||||
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
|
|
||||||
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
|
|
||||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
|
|
||||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
|
|
||||||
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
|
|
||||||
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
|
|
||||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
|
|
||||||
<value type="int">0</value>
|
|
||||||
<value type="int">1</value>
|
|
||||||
<value type="int">2</value>
|
|
||||||
<value type="int">3</value>
|
|
||||||
<value type="int">4</value>
|
|
||||||
<value type="int">5</value>
|
|
||||||
<value type="int">6</value>
|
|
||||||
<value type="int">7</value>
|
|
||||||
<value type="int">8</value>
|
|
||||||
<value type="int">9</value>
|
|
||||||
<value type="int">10</value>
|
|
||||||
<value type="int">11</value>
|
|
||||||
<value type="int">12</value>
|
|
||||||
<value type="int">13</value>
|
|
||||||
<value type="int">14</value>
|
|
||||||
</valuelist>
|
|
||||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
|
|
||||||
<value type="int">0</value>
|
|
||||||
<value type="int">1</value>
|
|
||||||
<value type="int">2</value>
|
|
||||||
<value type="int">3</value>
|
|
||||||
<value type="int">4</value>
|
|
||||||
<value type="int">5</value>
|
|
||||||
<value type="int">6</value>
|
|
||||||
<value type="int">7</value>
|
|
||||||
<value type="int">8</value>
|
|
||||||
<value type="int">9</value>
|
|
||||||
<value type="int">10</value>
|
|
||||||
<value type="int">11</value>
|
|
||||||
<value type="int">12</value>
|
|
||||||
<value type="int">13</value>
|
|
||||||
<value type="int">14</value>
|
|
||||||
</valuelist>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qtfossil</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">qtfossil.pro</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
|
|
||||||
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
|
|
||||||
<valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
|
|
||||||
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
|
||||||
</valuemap>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.TargetCount</variable>
|
|
||||||
<value type="int">1</value>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
|
|
||||||
<value type="QString">{bda40a79-bf37-4550-a115-261dea66cdf3}</value>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
|
|
||||||
<value type="int">10</value>
|
|
||||||
</data>
|
|
||||||
</qtcreator>
|
|
Reference in New Issue
Block a user