Minor modifications

excln · Apr 11, 2017 · 86e92e2 · 86e92e2
1 parent c9be366
commit 86e92e2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/ChannelFindTools.cpp b/src/ChannelFindTools.cpp
@@ -31,13 +31,13 @@ ChannelFindTools::ChannelFindTools(const QString &objectName, const QString &win
 
 	actionChannelFindFilterActive = new QAction(tr("Active Channels Only"), this);
 	actionChannelFindFilterActive->setIcon(SymbolIconManager::GetIcon(SymbolIconManager::Icon::SearchSound));
-	actionChannelFindFilterActive->setShortcut(Qt::ControlModifier + Qt::Key_B);
+	actionChannelFindFilterActive->setShortcut(Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_D);
 	SharedUIHelper::RegisterGlobalShortcut(actionChannelFindFilterActive);
 	actionChannelFindFilterActive->setCheckable(true);
 
-	actionChannelFindHideOthers = new QAction(tr("Show Found Channels Only"), this);
+	actionChannelFindHideOthers = new QAction(tr("Show Hit Channels Only"), this);
 	actionChannelFindHideOthers->setIcon(SymbolIconManager::GetIcon(SymbolIconManager::Icon::SearchHighlight));
-	actionChannelFindHideOthers->setShortcut(Qt::ControlModifier + Qt::Key_H);
+	actionChannelFindHideOthers->setShortcut(Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_F);
 	SharedUIHelper::RegisterGlobalShortcut(actionChannelFindHideOthers);
 	actionChannelFindHideOthers->setCheckable(true);
 
@@ -79,6 +79,7 @@ ChannelFindTools::ChannelFindTools(const QString &objectName, const QString &win
 	connect(keyword, SIGNAL(textChanged(QString)), this, SLOT(UpdateConditions()));
 	connect(actionChannelFindFilterActive, SIGNAL(triggered(bool)), this, SLOT(UpdateConditions()));
 	connect(actionChannelFindHideOthers, SIGNAL(triggered(bool)), this, SLOT(UpdateConditions()));
+	connect(actionChannelFindHideOthers, SIGNAL(triggered(bool)), this, SLOT(Activate()));
 
 	connect(keyword, SIGNAL(textChanged(QString)), mainWindow, SLOT(ChannelFindKeywordChanged(QString)));
 	connect(this, SIGNAL(FindNext(QString)), mainWindow, SLOT(ChannelFindNext(QString)));
@@ -111,6 +112,7 @@ void ChannelFindTools::ReplaceSequenceView(SequenceView *newSView)
 
 void ChannelFindTools::hideEvent(QHideEvent *event)
 {
+	actionChannelFindHideOthers->setChecked(false);
 	UpdateConditions();
 }
 

diff --git a/src/ExternalViewerTools.cpp b/src/ExternalViewerTools.cpp
@@ -131,6 +131,7 @@ void ExternalViewerTools::Configure()
 	if (dialog->exec() == QDialog::Accepted){
 		viewer->SetConfig(dialog->GetConfig(), dialog->GetIndex());
 	}
+	delete dialog;
 }
 
 void ExternalViewerTools::SetPlayable(bool playable)

diff --git a/src/i18n/ja.qm b/src/i18n/ja.qm
diff --git a/src/i18n/ja.ts b/src/i18n/ja.ts
@@ -84,6 +84,10 @@
     </message>
     <message>
         <location filename="../ChannelFindTools.cpp" line="38"/>
+        <source>Show Hit Channels Only</source>
+        <translation>検索結果のみ表示</translation>
+    </message>
+    <message>
         <source>Show Found Channels Only</source>
         <translation>検索結果のみ表示</translation>
     </message>
@@ -1347,7 +1351,7 @@ All files (*.*)</source>
     <message>
         <location filename="../Preferences.cpp" line="137"/>
         <source>UI Font:</source>
-        <translation>UIフォント</translation>
+        <translation>UIフォント:</translation>
     </message>
 </context>
 <context>