Skip to content

Commit

Permalink
Merge pull request #22 from myst6re/release/0.12.0
Browse files Browse the repository at this point in the history
Release/0.12.0
  • Loading branch information
myst6re committed Sep 4, 2021
2 parents 078ad47 + 9d1591a commit b8041c0
Show file tree
Hide file tree
Showing 8 changed files with 5,793 additions and 835 deletions.
2 changes: 1 addition & 1 deletion Deling.desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
Version=0.10.1b
Version=0.12.1b
Name=Deling
GenericName=FF8 Field Editor
GenericName[fr]=Éditeur d'écrans FF8
Expand Down
6 changes: 3 additions & 3 deletions SearchAll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SearchAll::SearchAll(QWidget *parent) :

connect(_resultList, SIGNAL(itemActivated(QTreeWidgetItem*,int)), SLOT(gotoResult(QTreeWidgetItem*)));

QAction *copy = new QAction(QIcon(":/images/copy.png"), tr("Copy"), this);
QAction *copy = new QAction(QIcon(":/images/copy.png"), tr("Copier"), this);
copy->setShortcut(QKeySequence("Ctrl+C"));
copy->setShortcutContext(Qt::WidgetWithChildrenShortcut);
connect(copy, SIGNAL(triggered()), SLOT(copySelected()));
Expand All @@ -45,15 +45,15 @@ void SearchAll::setScriptSearch()
{
clear();
_resultList->setColumnCount(4);
_resultList->setHeaderLabels(QStringList() << tr("Group") << tr("Script") << tr("Lines") << tr("Instruction"));
_resultList->setHeaderLabels(QStringList() << tr("Groupe") << tr("Script") << tr("Lignes") << tr("Instruction"));
_searchMode = ScriptSearch;
}

void SearchAll::setTextSearch()
{
clear();
_resultList->setColumnCount(2);
_resultList->setHeaderLabels(QStringList() << tr("Text #") << tr("Text"));
_resultList->setHeaderLabels(QStringList() << tr("N° de texte") << tr("Texte"));
_searchMode = TextSearch;
}

Expand Down
Loading

0 comments on commit b8041c0

Please sign in to comment.