Added translation to Russian. Fixed non-standard lamda in crossword generating. Added release builder script
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
#include "fsettings.hpp"
|
||||
|
||||
#ifndef APP_CATALOG
|
||||
#define APP_CATALOG "app" // replace with the appropriate catalog name
|
||||
#define APP_CATALOG "CrossGen"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -46,6 +46,7 @@ public:
|
||||
void onExitClick( wxCommandEvent& event );
|
||||
void onAboutClick( wxCommandEvent& event ) {
|
||||
wxAboutDialogInfo info;
|
||||
info.SetVersion(wxT("1.0"));
|
||||
info.AddDeveloper(_("Aleksey Lobanov"));
|
||||
info.SetDescription(_("Simple GUI cross-generation application. Yet another bike"));
|
||||
info.SetName(wxTheApp->GetAppName());
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
void SettingsDialog::onDictPathClick(wxCommandEvent& event) {
|
||||
wxFileDialog dlgOpen(this, _("Open dictionary file"), wxEmptyString, wxEmptyString,
|
||||
_("Files of dictionaris (*.txt)|*.txt"), wxFD_OPEN|wxFD_FILE_MUST_EXIST);
|
||||
_("Files of dictionaries (*.txt)|*.txt"), wxFD_OPEN|wxFD_FILE_MUST_EXIST);
|
||||
|
||||
if ( dlgOpen.ShowModal() == wxID_CANCEL )
|
||||
return;
|
||||
|
||||
@@ -16,13 +16,20 @@ IMPLEMENT_APP(MyApp)
|
||||
bool MyApp::OnInit()
|
||||
{
|
||||
m_locale.Init();
|
||||
wxLocale::AddCatalogLookupPathPrefix(wxT("."));
|
||||
#ifdef APP_LOCALE_DIR
|
||||
m_locale.AddCatalogLookupPathPrefix(wxT(APP_LOCALE_DIR));
|
||||
#endif
|
||||
m_locale.AddCatalog(wxT(APP_CATALOG));
|
||||
#ifdef __LINUX__
|
||||
{
|
||||
wxLogNull noLog;
|
||||
m_locale.AddCatalog(wxT("fileutils"));
|
||||
}
|
||||
#endif
|
||||
|
||||
SetAppName(wxT("CrossGen"));
|
||||
|
||||
|
||||
wxInitAllImageHandlers();
|
||||
wxConfigBase *config = new wxFileConfig;
|
||||
wxConfigBase::Set(config);
|
||||
|
||||
146
wxCrossGen/wxCrossGen.mk
Normal file
146
wxCrossGen/wxCrossGen.mk
Normal file
@@ -0,0 +1,146 @@
|
||||
##
|
||||
## Auto Generated makefile by CodeLite IDE
|
||||
## any manual changes will be erased
|
||||
##
|
||||
## Release
|
||||
ProjectName :=wxCrossGen
|
||||
ConfigurationName :=Release
|
||||
WorkspacePath := "/data/Sync/SyncProjects/CrossGen"
|
||||
ProjectPath := "/data/Sync/SyncProjects/CrossGen/wxCrossGen"
|
||||
IntermediateDirectory :=../Release
|
||||
OutDir := $(IntermediateDirectory)
|
||||
CurrentFileName :=
|
||||
CurrentFilePath :=
|
||||
CurrentFileFullPath :=
|
||||
User :=Aleksey Lobanov
|
||||
Date :=23/07/15
|
||||
CodeLitePath :="/home/alex/.codelite"
|
||||
LinkerName :=/usr/bin/g++-4.8
|
||||
SharedObjectLinkerName :=/usr/bin/g++-4.8 -shared -fPIC
|
||||
ObjectSuffix :=.o
|
||||
DependSuffix :=.o.d
|
||||
PreprocessSuffix :=.i
|
||||
DebugSwitch :=-g
|
||||
IncludeSwitch :=-I
|
||||
LibrarySwitch :=-l
|
||||
OutputSwitch :=-o
|
||||
LibraryPathSwitch :=-L
|
||||
PreprocessorSwitch :=-D
|
||||
SourceSwitch :=-c
|
||||
OutputFile :=$(IntermediateDirectory)/$(ProjectName).out
|
||||
Preprocessors :=$(PreprocessorSwitch)NDEBUG
|
||||
ObjectSwitch :=-o
|
||||
ArchiveOutputSwitch :=
|
||||
PreprocessOnlySwitch :=-E
|
||||
ObjectsFileList :="wxCrossGen.txt"
|
||||
PCHCompileFlags :=
|
||||
MakeDirCommand :=mkdir -p
|
||||
LinkOptions := -s $(shell wx-config --debug=no --libs --unicode=yes)
|
||||
IncludePath := $(IncludeSwitch). $(IncludeSwitch)../src
|
||||
IncludePCH :=
|
||||
RcIncludePath :=
|
||||
Libs :=
|
||||
ArLibs :=
|
||||
LibPath := $(LibraryPathSwitch).
|
||||
|
||||
##
|
||||
## Common variables
|
||||
## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables
|
||||
##
|
||||
AR := /usr/bin/ar rcu
|
||||
CXX := /usr/bin/g++-4.8
|
||||
CC := /usr/bin/gcc-4.8
|
||||
CXXFLAGS := -std=c++11 -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
|
||||
CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
|
||||
ASFLAGS :=
|
||||
AS := /usr/bin/as
|
||||
|
||||
|
||||
##
|
||||
## User defined environment variables
|
||||
##
|
||||
CodeLiteDir:=/usr/share/codelite
|
||||
Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/fmain.cpp$(ObjectSuffix) $(IntermediateDirectory)/fsettings.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_crossexport.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_crossgen.cpp$(ObjectSuffix) $(IntermediateDirectory)/fbgui_fbgui.cpp$(ObjectSuffix)
|
||||
|
||||
|
||||
|
||||
Objects=$(Objects0)
|
||||
|
||||
##
|
||||
## Main Build Targets
|
||||
##
|
||||
.PHONY: all clean PreBuild PrePreBuild PostBuild
|
||||
all: $(OutputFile)
|
||||
|
||||
$(OutputFile): $(IntermediateDirectory)/.d $(Objects)
|
||||
@$(MakeDirCommand) $(@D)
|
||||
@echo "" > $(IntermediateDirectory)/.d
|
||||
@echo $(Objects0) > $(ObjectsFileList)
|
||||
$(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)
|
||||
|
||||
$(IntermediateDirectory)/.d:
|
||||
@test -d ../Release || $(MakeDirCommand) ../Release
|
||||
|
||||
PreBuild:
|
||||
|
||||
|
||||
##
|
||||
## Objects
|
||||
##
|
||||
$(IntermediateDirectory)/main.cpp$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main.cpp$(DependSuffix)
|
||||
$(CXX) $(IncludePCH) $(SourceSwitch) "/data/Sync/SyncProjects/CrossGen/wxCrossGen/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IncludePath)
|
||||
$(IntermediateDirectory)/main.cpp$(DependSuffix): main.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/main.cpp$(DependSuffix) -MM "main.cpp"
|
||||
|
||||
$(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.cpp$(PreprocessSuffix) "main.cpp"
|
||||
|
||||
$(IntermediateDirectory)/fmain.cpp$(ObjectSuffix): fmain.cpp $(IntermediateDirectory)/fmain.cpp$(DependSuffix)
|
||||
$(CXX) $(IncludePCH) $(SourceSwitch) "/data/Sync/SyncProjects/CrossGen/wxCrossGen/fmain.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/fmain.cpp$(ObjectSuffix) $(IncludePath)
|
||||
$(IntermediateDirectory)/fmain.cpp$(DependSuffix): fmain.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fmain.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/fmain.cpp$(DependSuffix) -MM "fmain.cpp"
|
||||
|
||||
$(IntermediateDirectory)/fmain.cpp$(PreprocessSuffix): fmain.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fmain.cpp$(PreprocessSuffix) "fmain.cpp"
|
||||
|
||||
$(IntermediateDirectory)/fsettings.cpp$(ObjectSuffix): fsettings.cpp $(IntermediateDirectory)/fsettings.cpp$(DependSuffix)
|
||||
$(CXX) $(IncludePCH) $(SourceSwitch) "/data/Sync/SyncProjects/CrossGen/wxCrossGen/fsettings.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/fsettings.cpp$(ObjectSuffix) $(IncludePath)
|
||||
$(IntermediateDirectory)/fsettings.cpp$(DependSuffix): fsettings.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fsettings.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/fsettings.cpp$(DependSuffix) -MM "fsettings.cpp"
|
||||
|
||||
$(IntermediateDirectory)/fsettings.cpp$(PreprocessSuffix): fsettings.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fsettings.cpp$(PreprocessSuffix) "fsettings.cpp"
|
||||
|
||||
$(IntermediateDirectory)/src_crossexport.cpp$(ObjectSuffix): ../src/crossexport.cpp $(IntermediateDirectory)/src_crossexport.cpp$(DependSuffix)
|
||||
$(CXX) $(IncludePCH) $(SourceSwitch) "/data/Sync/SyncProjects/CrossGen/src/crossexport.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_crossexport.cpp$(ObjectSuffix) $(IncludePath)
|
||||
$(IntermediateDirectory)/src_crossexport.cpp$(DependSuffix): ../src/crossexport.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_crossexport.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/src_crossexport.cpp$(DependSuffix) -MM "../src/crossexport.cpp"
|
||||
|
||||
$(IntermediateDirectory)/src_crossexport.cpp$(PreprocessSuffix): ../src/crossexport.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_crossexport.cpp$(PreprocessSuffix) "../src/crossexport.cpp"
|
||||
|
||||
$(IntermediateDirectory)/src_crossgen.cpp$(ObjectSuffix): ../src/crossgen.cpp $(IntermediateDirectory)/src_crossgen.cpp$(DependSuffix)
|
||||
$(CXX) $(IncludePCH) $(SourceSwitch) "/data/Sync/SyncProjects/CrossGen/src/crossgen.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_crossgen.cpp$(ObjectSuffix) $(IncludePath)
|
||||
$(IntermediateDirectory)/src_crossgen.cpp$(DependSuffix): ../src/crossgen.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_crossgen.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/src_crossgen.cpp$(DependSuffix) -MM "../src/crossgen.cpp"
|
||||
|
||||
$(IntermediateDirectory)/src_crossgen.cpp$(PreprocessSuffix): ../src/crossgen.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_crossgen.cpp$(PreprocessSuffix) "../src/crossgen.cpp"
|
||||
|
||||
$(IntermediateDirectory)/fbgui_fbgui.cpp$(ObjectSuffix): fbgui/fbgui.cpp $(IntermediateDirectory)/fbgui_fbgui.cpp$(DependSuffix)
|
||||
$(CXX) $(IncludePCH) $(SourceSwitch) "/data/Sync/SyncProjects/CrossGen/wxCrossGen/fbgui/fbgui.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/fbgui_fbgui.cpp$(ObjectSuffix) $(IncludePath)
|
||||
$(IntermediateDirectory)/fbgui_fbgui.cpp$(DependSuffix): fbgui/fbgui.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fbgui_fbgui.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/fbgui_fbgui.cpp$(DependSuffix) -MM "fbgui/fbgui.cpp"
|
||||
|
||||
$(IntermediateDirectory)/fbgui_fbgui.cpp$(PreprocessSuffix): fbgui/fbgui.cpp
|
||||
@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fbgui_fbgui.cpp$(PreprocessSuffix) "fbgui/fbgui.cpp"
|
||||
|
||||
|
||||
-include $(IntermediateDirectory)/*$(DependSuffix)
|
||||
##
|
||||
## Clean
|
||||
##
|
||||
clean:
|
||||
$(RM) -r ../Release/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user