small cleanup

wanhuz · Jul 1, 2021 · b3e9329 · b3e9329
1 parent c762498
commit b3e9329
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 3 deletions.
diff --git a/vs2019/mecab.h → lib/mecab/include/mecab.h b/vs2019/mecab.h → lib/mecab/include/mecab.h
diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui
@@ -126,7 +126,7 @@
            <string/>
           </property>
           <property name="placeholderText">
-           <string>Search Eng-Japanese</string>
+           <string/>
           </property>
          </widget>
         </item>
@@ -187,6 +187,7 @@ selection-color: #000;
 
 QScrollBar {
 	color: red;
+    background-color: red;
 	border-left: 0px;
 }</string>
         </property>
@@ -217,6 +218,12 @@ QScrollBar {
         <property name="selectionBehavior">
          <enum>QAbstractItemView::SelectRows</enum>
         </property>
+        <property name="verticalScrollMode">
+         <enum>QAbstractItemView::ScrollPerPixel</enum>
+        </property>
+        <property name="horizontalScrollMode">
+         <enum>QAbstractItemView::ScrollPerPixel</enum>
+        </property>
         <property name="showGrid">
          <bool>true</bool>
         </property>

diff --git a/src/util/util.cpp b/src/util/util.cpp
@@ -5,7 +5,8 @@
 #include <iostream>
 #include <locale>
 #include <qtextcodec.h>
-#include "mecab/mecab.h"
+#include <mecab.h>
+#include <qmessagebox.h>
 #pragma comment(lib, "libmecab.lib")
 #pragma QT_NO_CAST_FROM_ASCII
 #pragma QT_NO_CAST_TO_ASCII
@@ -80,18 +81,22 @@ int Util::sendKeyInput() {
 /*Extract and return root word from Japanese sentence. Only return first word in a given string*/
 QString Util::getRootWord(QString targetWord) {
 
+
 	//QString to const char conversion
 	QByteArray array = targetWord.toLocal8Bit();
 	const char* data = array.constData();
 
 	//Init MeCab
 	MeCab::Model* model = MeCab::createModel("");
+
 	MeCab::Tagger* tagger = model->createTagger();
+
 	CHECK(tagger);
+
 	const char* result = tagger->parse(data);
 	CHECK(result);
 
-	//Get root word of first word in the sentence
+	////Get root word of first word in the sentence
 	QString qresult(result);
 	QStringList fresult = qresult.split("\t");
 

diff --git a/vs2019/Debug/KanjiProgram.log b/vs2019/Debug/KanjiProgram.log
@@ -0,0 +1 @@
+C:\Users\WanHuz\AppData\Local\QtMsBuild\qt_vars.targets(68,5): error : There's no Qt version assigned to project KanjiProgram.vcxproj for configuration Debug/Win32. Please assign a Qt installation in 'Qt Project Settings'.
diff --git a/vs2019/Debug/Shanachan.tlog/Shanachan.lastbuildstate b/vs2019/Debug/Shanachan.tlog/Shanachan.lastbuildstate
@@ -0,0 +1,2 @@
+PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.28.29333:TargetPlatformVersion=10.0.18362.0:VcpkgTriplet=x86-windows:
+Debug|Win32|C:\Users\WanHuz\Documents\Shanachan\vs2019\|
diff --git a/vs2019/Debug/Shanachan.tlog/unsuccessfulbuild b/vs2019/Debug/Shanachan.tlog/unsuccessfulbuild
diff --git a/vs2019/KanjiProgram.sln b/vs2019/KanjiProgram.sln
@@ -7,14 +7,35 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shanachan", "KanjiProgram.v
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		x86|Win32 = x86|Win32
+		x86|x64 = x86|x64
+		x86|x86 = x86|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Debug|Win32.Build.0 = Debug|Win32
 		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Debug|x64.ActiveCfg = Debug|x64
 		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Debug|x64.Build.0 = Debug|x64
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Debug|x86.ActiveCfg = Debug|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Debug|x86.Build.0 = Debug|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Release|Win32.ActiveCfg = Release|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Release|Win32.Build.0 = Release|Win32
 		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Release|x64.ActiveCfg = Release|x64
 		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Release|x64.Build.0 = Release|x64
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Release|x86.ActiveCfg = Release|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.Release|x86.Build.0 = Release|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.x86|Win32.ActiveCfg = x86|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.x86|Win32.Build.0 = x86|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.x86|x64.ActiveCfg = x86|x64
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.x86|x64.Build.0 = x86|x64
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.x86|x86.ActiveCfg = x86|Win32
+		{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}.x86|x86.Build.0 = x86|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/vs2019/KanjiProgram.vcxproj b/vs2019/KanjiProgram.vcxproj
@@ -1,20 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="x86|Win32">
+      <Configuration>x86</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="x86|x64">
+      <Configuration>x86</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{98E91A1F-1480-4BA6-A2C0-E19DADAD2756}</ProjectGuid>
     <Keyword>QtVS_v304</Keyword>
     <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0.18362.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)'=='x86|x64'">10.0.18362.0</WindowsTargetPlatformVersion>
     <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
     <ProjectName>Shanachan</ProjectName>
   </PropertyGroup>
@@ -27,6 +44,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='x86|Win32'">
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
     <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
@@ -39,6 +69,9 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='x86|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
     <Import Project="$(QtMsBuild)\qt_defaults.props" />
@@ -51,8 +84,26 @@
     <LibraryPath>C:\Program Files %28x86%29\MeCab\sdk;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+    <IncludePath>C:\Program Files %28x86%29\MeCab\sdk;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Program Files %28x86%29\MeCab\sdk;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86|x64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalIncludeDirectories>C:\Users\WanHuz\Documents\Shanachan\lib\mecab\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link />
+    <CustomBuildStep>
+      <Command>mecab-config --libs</Command>
+    </CustomBuildStep>
+    <Link>
+      <AdditionalLibraryDirectories>C:\Users\WanHuz\Documents\Shanachan\lib\mecab\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(Qt_LIBS_);%(AdditionalDependencies);C:\Users\WanHuz\Documents\Shanachan\lib\mecab\lib\libmecab.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='x86|x64'">
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -92,6 +143,12 @@
     <QtInstall>5.15.1_msvc2019_64</QtInstall>
     <QtDeploy>false</QtDeploy>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86|x64'" Label="QtSettings">
+    <QtModules>core;gui;widgets</QtModules>
+    <QtBuildConfig>release</QtBuildConfig>
+    <QtInstall>5.15.1_msvc2019_64</QtInstall>
+    <QtDeploy>false</QtDeploy>
+  </PropertyGroup>
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
     <Import Project="$(QtMsBuild)\qt.props" />
   </ImportGroup>
@@ -123,6 +180,20 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='x86|x64'" Label="Configuration">
+    <ClCompile>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <Optimization>MaxSpeed</Optimization>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\capturekey\maincontroller.cpp" />
     <ClCompile Include="..\src\capturekey\capturekey.cpp" />