Page MenuHomePhabricator (Chris)
Files F118101

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.gitignore b/.gitignore
index d126b24..f8a7a6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,23 @@
*.user
win.rc
Info.plist
version.c
_notes
_release
.DS_Store
image/about.psd
extra/_build_*
misc/win32tools
_bin/
build/
src/version.h
*.autosave
src/version.h
*.deb
packaging/win/packages/jp.soramimi.guitar/data/
packaging/win/GuitarSetup.exe
packaging/mac/Guitar.app
packaging/mac/Guitar.app/Contents/Frameworks/QtCore.framework/QtCore
packaging/mac/*.zip
packaging/mac/Guitar-macos.zip
+docs/src_docs/
diff --git a/Doxy.conf b/Doxy.conf
index 7e32752..d4c6128 100644
--- a/Doxy.conf
+++ b/Doxy.conf
@@ -1,14 +1,16 @@
+PROJECT_NAME = "Guitar"
+
OUTPUT_DIRECTORY = ./docs/src_docs
EXTRACT_ALL = yes
EXTRACT_PRIVATE = yes
EXTRACT_STATIC = yes
HAVE_DOT = yes
CLASS_DIAGRAMS = yes
CALL_GRAPH = yes
RECURSIVE = yes
INPUT = ./src
#common formats like .c/.cc/.cxx/.c++/.cpp/.inl/.h/.hpp
#FILE_PATTERNS = .c .h
RECURSIVE = yes
diff --git a/src/EditGitIgnoreDialog.cpp b/src/EditGitIgnoreDialog.cpp
index e9374d4..3345e40 100644
--- a/src/EditGitIgnoreDialog.cpp
+++ b/src/EditGitIgnoreDialog.cpp
@@ -1,65 +1,65 @@
#include "EditGitIgnoreDialog.h"
#include "MainWindow.h"
#include "TextEditDialog.h"
#include "ui_EditGitIgnoreDialog.h"
#include <QFileInfo>
EditGitIgnoreDialog::EditGitIgnoreDialog(MainWindow *parent, QString const &gitignore_path, QString const &file)
: QDialog(parent)
, ui(new Ui::EditGitIgnoreDialog)
, gitignore_path(gitignore_path)
{
ui->setupUi(this);
Qt::WindowFlags flags = windowFlags();
flags &= ~Qt::WindowContextHelpButtonHint;
setWindowFlags(flags);
QFileInfo info(file);
ui->radioButton_1->setText(file);
ui->radioButton_2->setText("*." + info.suffix());
int i = file.indexOf('/');
if (i > 0) {
ui->radioButton_3->setText(file.mid(0, i + 1));
int j = file.lastIndexOf('/');
if (i < j) {
ui->radioButton_4->setText(file.mid(0, j + 1));
} else {
ui->radioButton_4->setVisible(false);
}
} else {
ui->radioButton_3->setVisible(false);
ui->radioButton_4->setVisible(false);
}
ui->radioButton_1->click();
}
EditGitIgnoreDialog::~EditGitIgnoreDialog()
{
delete ui;
}
MainWindow *EditGitIgnoreDialog::mainwindow()
{
return qobject_cast<MainWindow *>(parent());
}
QString EditGitIgnoreDialog::text() const
{
if (ui->radioButton_1->isChecked()) return ui->radioButton_1->text();
if (ui->radioButton_2->isChecked()) return ui->radioButton_2->text();
if (ui->radioButton_3->isChecked()) return ui->radioButton_3->text();
if (ui->radioButton_4->isChecked()) return ui->radioButton_4->text();
return QString();
}
void EditGitIgnoreDialog::on_pushButton_edit_file_clicked()
{
if (TextEditDialog::editFile(this, gitignore_path, ".gitignore", text() + '\n')) {
mainwindow()->updateCurrentFilesList();
- done(QDialog::Accepted);
+ done(QDialog::Rejected);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Fri, May 15, 8:49 AM (12 h, 41 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
63898
Default Alt Text
(2 KB)

Event Timeline