Skip to content

Commit

Permalink
Merge branch 'devel/welcome'
Browse files Browse the repository at this point in the history
  • Loading branch information
@vslavik
vslavik committed Jan 22, 2021
2 parents 59597c2 + 8766339 commit 266d1ec
Show file tree
Hide file tree
Showing 38 changed files with 1,990 additions and 867 deletions.
14 changes: 10 additions & 4 deletions Poedit.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,7 @@
<ClCompile Include="src\crowdin_gui.cpp" />
<ClCompile Include="src\customcontrols.cpp" />
<ClCompile Include="src\custom_buttons.cpp" />
<ClCompile Include="src\edapp.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\edapp.cpp" />
<ClCompile Include="src\edframe.cpp" />
<ClCompile Include="src\editing_area.cpp" />
<ClCompile Include="src\edlistctrl.cpp" />
Expand All @@ -141,6 +138,7 @@
<ClCompile Include="src\language.cpp" />
<ClCompile Include="src\languagectrl.cpp" />
<ClCompile Include="src\manager.cpp" />
<ClCompile Include="src\menus.cpp" />
<ClCompile Include="src\pluralforms\pl_evaluate.cpp" />
<ClCompile Include="src\prefsdlg.cpp" />
<ClCompile Include="src\pretranslate.cpp" />
Expand All @@ -152,6 +150,7 @@
<ClCompile Include="src\spellchecking.cpp" />
<ClCompile Include="src\syntaxhighlighter.cpp" />
<ClCompile Include="src\text_control.cpp" />
<ClCompile Include="src\titleless_window.cpp" />
<ClCompile Include="src\tm\suggestions.cpp" />
<ClCompile Include="src\tm\tmx_io.cpp" />
<ClCompile Include="src\tm\transmem.cpp" />
Expand Down Expand Up @@ -203,6 +202,7 @@
<ClInclude Include="src\logcapture.h" />
<ClInclude Include="src\main_toolbar.h" />
<ClInclude Include="src\manager.h" />
<ClInclude Include="src\menus.h" />
<ClInclude Include="src\pluralforms\pl_evaluate.h" />
<ClInclude Include="src\prefsdlg.h" />
<ClInclude Include="src\pretranslate.h" />
Expand All @@ -216,6 +216,7 @@
<ClInclude Include="src\str_helpers.h" />
<ClInclude Include="src\syntaxhighlighter.h" />
<ClInclude Include="src\text_control.h" />
<ClInclude Include="src\titleless_window.h" />
<ClInclude Include="src\tm\suggestions.h" />
<ClInclude Include="src\tm\tmx_io.h" />
<ClInclude Include="src\tm\transmem.h" />
Expand Down Expand Up @@ -307,6 +308,11 @@
<None Include="Poedit.Targets">
<SubType>Designer</SubType>
</None>
<ClCompile Include="src\Poedit-Prefix.pch">
<FileType>Document</FileType>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<None Include="src\resources\comment.xrc" />
<None Include="src\resources\manager.xrc" />
<None Include="src\resources\menus.xrc" />
Expand Down
15 changes: 15 additions & 0 deletions Poedit.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,15 @@
<ClCompile Include="src\recent_files.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\menus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\titleless_window.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Poedit-Prefix.pch">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\attentionbar.h">
Expand Down Expand Up @@ -356,6 +365,12 @@
<ClInclude Include="src\recent_files.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\menus.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\titleless_window.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="src\poedit.rc">
Expand Down
42 changes: 34 additions & 8 deletions Poedit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,13 @@
B26897B4197A830200B42764 /* MoveApplication.strings in Resources */ = {isa = PBXBuildFile; fileRef = B26897B2197A830200B42764 /* MoveApplication.strings */; };
B26D064F182506E40069C378 /* languagectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26D064D182506E40069C378 /* languagectrl.cpp */; };
B26D0655182697200069C378 /* welcomescreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26D0653182697200069C378 /* welcomescreen.cpp */; };
B26D06581826A22C0069C378 /* PoeditWelcome.png in Resources */ = {isa = PBXBuildFile; fileRef = B26D06561826A22C0069C378 /* PoeditWelcome.png */; };
B26D06591826A22C0069C378 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = B26D06571826A22C0069C378 /* [email protected] */; };
B26E2C8325A244FF008D6DF1 /* icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26E2C8125A244FE008D6DF1 /* icons.cpp */; };
B26E2C8625A24541008D6DF1 /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26E2C8425A24541008D6DF1 /* menus.cpp */; };
B26E2C8925A24571008D6DF1 /* titleless_window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26E2C8825A24571008D6DF1 /* titleless_window.cpp */; };
B26E2C8E25A245BD008D6DF1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = B26E2C8A25A245BC008D6DF1 /* [email protected] */; };
B26E2C8F25A245BD008D6DF1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = B26E2C8B25A245BC008D6DF1 /* [email protected] */; };
B26E2C9025A245BD008D6DF1 /* CloseButtonTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = B26E2C8C25A245BC008D6DF1 /* CloseButtonTemplate.png */; };
B26E2C9125A245BD008D6DF1 /* CloseButtonHoverTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = B26E2C8D25A245BD008D6DF1 /* CloseButtonHoverTemplate.png */; };
B27959DE1E85850A00DBA47D /* qa_checks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B27959DC1E85850A00DBA47D /* qa_checks.cpp */; };
B27959DF1E858F7100DBA47D /* qa_checks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B27959DC1E85850A00DBA47D /* qa_checks.cpp */; };
B280E84D1A92776D009F4A98 /* http_client_macos.mm in Sources */ = {isa = PBXBuildFile; fileRef = B280E84B1A92776D009F4A98 /* http_client_macos.mm */; };
Expand Down Expand Up @@ -387,8 +392,16 @@
B26D064E182506E40069C378 /* languagectrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = languagectrl.h; sourceTree = "<group>"; };
B26D0653182697200069C378 /* welcomescreen.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = welcomescreen.cpp; sourceTree = "<group>"; };
B26D0654182697200069C378 /* welcomescreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welcomescreen.h; sourceTree = "<group>"; };
B26D06561826A22C0069C378 /* PoeditWelcome.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PoeditWelcome.png; sourceTree = "<group>"; };
B26D06571826A22C0069C378 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
B26E2C8125A244FE008D6DF1 /* icons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = icons.cpp; sourceTree = "<group>"; };
B26E2C8225A244FF008D6DF1 /* icons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icons.h; sourceTree = "<group>"; };
B26E2C8425A24541008D6DF1 /* menus.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = menus.cpp; sourceTree = "<group>"; };
B26E2C8525A24541008D6DF1 /* menus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menus.h; sourceTree = "<group>"; };
B26E2C8725A24571008D6DF1 /* titleless_window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = titleless_window.h; sourceTree = "<group>"; };
B26E2C8825A24571008D6DF1 /* titleless_window.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = titleless_window.cpp; sourceTree = "<group>"; };
B26E2C8A25A245BC008D6DF1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "macos/[email protected]"; sourceTree = "<group>"; };
B26E2C8B25A245BC008D6DF1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "macos/[email protected]"; sourceTree = "<group>"; };
B26E2C8C25A245BC008D6DF1 /* CloseButtonTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseButtonTemplate.png; path = macos/CloseButtonTemplate.png; sourceTree = "<group>"; };
B26E2C8D25A245BD008D6DF1 /* CloseButtonHoverTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseButtonHoverTemplate.png; path = macos/CloseButtonHoverTemplate.png; sourceTree = "<group>"; };
B27959DC1E85850A00DBA47D /* qa_checks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qa_checks.cpp; sourceTree = "<group>"; };
B27959DD1E85850A00DBA47D /* qa_checks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qa_checks.h; sourceTree = "<group>"; };
B27D1FC519EFFA2800AB1913 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/InfoPlist.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -766,8 +779,12 @@
B28F1CC516F629D30018AF7E /* gexecute.h */,
B230E2261A73F81400FB1E57 /* hidpi.cpp */,
B230E2271A73F81400FB1E57 /* hidpi.h */,
B26E2C8125A244FE008D6DF1 /* icons.cpp */,
B26E2C8225A244FF008D6DF1 /* icons.h */,
B28F1CCA16F629D30018AF7E /* manager.cpp */,
B28F1CCB16F629D30018AF7E /* manager.h */,
B26E2C8425A24541008D6DF1 /* menus.cpp */,
B26E2C8525A24541008D6DF1 /* menus.h */,
B28F1CCC16F629D30018AF7E /* macos_helpers.h */,
B28F1CCD16F629D30018AF7E /* macos_helpers.mm */,
B28F1CD016F629D30018AF7E /* prefsdlg.cpp */,
Expand All @@ -788,6 +805,8 @@
B2E2184B199A76B100EA2784 /* syntaxhighlighter.h */,
B2E11F101A2C66FB00E4E42C /* text_control.cpp */,
B2E11F111A2C66FB00E4E42C /* text_control.h */,
B26E2C8825A24571008D6DF1 /* titleless_window.cpp */,
B26E2C8725A24571008D6DF1 /* titleless_window.h */,
B28F1CDE16F629D30018AF7E /* utility.cpp */,
B28F1CDF16F629D30018AF7E /* utility.h */,
B26D064D182506E40069C378 /* languagectrl.cpp */,
Expand Down Expand Up @@ -1010,6 +1029,10 @@
B2B1EB0619E45FE7009A59B7 /* Toolbar */,
B2166F4019AE4024000A6AA0 /* Preferences */,
B24ACD8316F6263900399242 /* Poedit.iconset */,
B26E2C8D25A245BD008D6DF1 /* CloseButtonHoverTemplate.png */,
B26E2C8A25A245BC008D6DF1 /* [email protected] */,
B26E2C8C25A245BC008D6DF1 /* CloseButtonTemplate.png */,
B26E2C8B25A245BC008D6DF1 /* [email protected] */,
B290F9E22166543800741842 /* DownvoteTemplate.png */,
B290F9E12166543800741842 /* [email protected] */,
B2E836E21709ED2A00F31559 /* poedit-status-cat-mid.png */,
Expand All @@ -1027,8 +1050,6 @@
B24D19681E84503B00C6DD8D /* [email protected] */,
B20F31CE216654DA005B7037 /* StatusWarningBlack.png */,
B20F31CF216654DA005B7037 /* [email protected] */,
B26D06561826A22C0069C378 /* PoeditWelcome.png */,
B26D06571826A22C0069C378 /* [email protected] */,
B209005F19CAD64A00D6382E /* SuggestionErrorTemplate.png */,
B2E7F16D1E045343005FA992 /* [email protected] */,
B2D52B841DE88A3D00E27B35 /* SuggestionPerfectMatch.png */,
Expand Down Expand Up @@ -1231,6 +1252,7 @@
B29A1C331A9F8C0A00BC3006 /* poedit-sync.png in Resources */,
B2E836EB1709ED2A00F31559 /* poedit-status-cat-mid.png in Resources */,
B20F31CD216654D2005B7037 /* StatusErrorBlack.png in Resources */,
B26E2C9025A245BD008D6DF1 /* CloseButtonTemplate.png in Resources */,
B2E836EC1709ED2A00F31559 /* poedit-status-cat-no.png in Resources */,
B2E836ED1709ED2A00F31559 /* poedit-status-cat-ok.png in Resources */,
B22A5C86184E4B870034BEFD /* [email protected] in Resources */,
Expand All @@ -1243,11 +1265,13 @@
B2E837021709ED6300F31559 /* poedit-update.png in Resources */,
B2E837031709ED6300F31559 /* poedit-validate.png in Resources */,
B267EAFD1E045959005541E7 /* StatusError.png in Resources */,
B26E2C8E25A245BD008D6DF1 /* [email protected] in Resources */,
B290F9E32166543800741842 /* [email protected] in Resources */,
B292667421664C9500DC536C /* ItemCommentTemplate.png in Resources */,
B290F9E42166543800741842 /* DownvoteTemplate.png in Resources */,
B29AE89017103992008D1F8A /* comment.xrc in Resources */,
B22A5C83184E4B870034BEFD /* [email protected] in Resources */,
B26E2C8F25A245BD008D6DF1 /* [email protected] in Resources */,
B292667621664C9500DC536C /* [email protected] in Resources */,
B2A012B321BEE4C5008051FD /* [email protected] in Resources */,
B20F31D0216654DA005B7037 /* StatusWarningBlack.png in Resources */,
Expand All @@ -1266,12 +1290,11 @@
B29AE89617103992008D1F8A /* properties.xrc in Resources */,
B29AE89717103992008D1F8A /* summary.xrc in Resources */,
B29AE89A17103992008D1F8A /* toolbar.xrc in Resources */,
B26E2C9125A245BD008D6DF1 /* CloseButtonHoverTemplate.png in Resources */,
B2CE2FEC1A94EBDE0020A620 /* [email protected] in Resources */,
B2EC60A41812D9D40059756A /* icudt57l.dat in Resources */,
B25DB35E1E3E5102006D7228 /* [email protected] in Resources */,
B24D196A1E84503B00C6DD8D /* [email protected] in Resources */,
B26D06581826A22C0069C378 /* PoeditWelcome.png in Resources */,
B26D06591826A22C0069C378 /* [email protected] in Resources */,
B26897B4197A830200B42764 /* MoveApplication.strings in Resources */,
B292667521664C9500DC536C /* [email protected] in Resources */,
B22A5C82184E4B870034BEFD /* [email protected] in Resources */,
Expand Down Expand Up @@ -1458,7 +1481,9 @@
B295C6031E2A81C200CD71CD /* extractor.cpp in Sources */,
B28F1CEE16F629D30018AF7E /* edlistctrl.cpp in Sources */,
B28F1CF016F629D30018AF7E /* fileviewer.cpp in Sources */,
B26E2C8925A24571008D6DF1 /* titleless_window.cpp in Sources */,
B2132FDA19B3672000326B16 /* customcontrols.cpp in Sources */,
B26E2C8325A244FF008D6DF1 /* icons.cpp in Sources */,
B295C6021E2A81C200CD71CD /* extractor_legacy.cpp in Sources */,
B28F1CF116F629D30018AF7E /* findframe.cpp in Sources */,
B28F1CF216F629D30018AF7E /* gexecute.cpp in Sources */,
Expand All @@ -1484,6 +1509,7 @@
B280E84D1A92776D009F4A98 /* http_client_macos.mm in Sources */,
B22C5F0A17DDC67400ECAFD1 /* language.cpp in Sources */,
B2E2184C199A76B100EA2784 /* syntaxhighlighter.cpp in Sources */,
B26E2C8625A24541008D6DF1 /* menus.cpp in Sources */,
B2377A202159179B0085E9C4 /* catalog_xliff.cpp in Sources */,
B2284A53183BE3B300E097C7 /* PFMoveApplication.m in Sources */,
B25D94941AE3D7E3003BC368 /* concurrency.cpp in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Poedit2.xcworkspace/xcshareddata/xcschemes/Poedit.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</CommandLineArgument>
<CommandLineArgument
argument = "$PROJECT_DIR/locales/cs.po"
isEnabled = "YES">
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "$PROJECT_DIR/locales/he.po"
Expand Down
1 change: 0 additions & 1 deletion artwork/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ dist_uiicons_DATA = \
ExtractorsGNUgettext.png \
ItemBookmarkTemplate.png \
ItemCommentTemplate.png \
PoeditWelcome.png \
SuggestionErrorTemplate.png \
SuggestionPerfectMatch.png \
SuggestionTMTemplate.png \
Expand Down
Binary file removed artwork/PoeditWelcome.png
View file
Binary file not shown.
Binary file removed artwork/[email protected]
View file
Binary file not shown.
Binary file removed artwork/[email protected]
View file
Binary file not shown.
Binary file added artwork/macos/CloseButtonHoverTemplate.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added artwork/macos/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added artwork/macos/CloseButtonTemplate.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added artwork/macos/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ poedit_SOURCES = \
logcapture.h \
main_toolbar.h wx/main_toolbar.cpp \
manager.h manager.cpp \
menus.h menus.cpp \
pluralforms/pl_evaluate.cpp pluralforms/pl_evaluate.h \
prefsdlg.cpp prefsdlg.h \
pretranslate.cpp pretranslate.h \
Expand All @@ -67,6 +68,7 @@ poedit_SOURCES = \
str_helpers.h \
syntaxhighlighter.cpp syntaxhighlighter.h \
text_control.h text_control.cpp \
titleless_window.h titleless_window.cpp \
tm/suggestions.cpp tm/suggestions.h \
tm/transmem.cpp tm/transmem.h \
tm/tmx_io.cpp tm/tmx_io.h \
Expand Down
Loading

0 comments on commit 266d1ec

Please sign in to comment.