Skip to content

[pull] master from scribusproject:master #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 7 commits into from
May 30, 2021
Merged

[pull] master from scribusproject:master #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
178f3d5
Bump TS files
May 27, 2021
49da1b0
Some workarounds for building with Qt6
May 27, 2021
64ff8f8
Fix missing include for QTextCodec
May 27, 2021
5e148bc
Include Qt6 Network module
May 27, 2021
234b858
#16567: Import PDF as text should create 1-column text frames
May 29, 2021
22ebe11
Fix compiler warning
May 29, 2021
577e2b0
Fix compiler warnings
May 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions CMakeLists_Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,29 @@ else()
#WANT QT6
message(STATUS "Qt6 Requested")
find_package(Qt6 COMPONENTS Core REQUIRED)
find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
find_package(Qt6 COMPONENTS Gui REQUIRED)
find_package(Qt6 COMPONENTS Widgets REQUIRED)
include_directories(${Qt6Core_INCLUDE_DIRS})
add_definitions(${Qt6Core_DEFINITIONS})
include_directories(${Qt6Core_INCLUDE_DIRS})

find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
include_directories(${Qt6Core5Compat_INCLUDE_DIRS})
add_definitions(${Qt6Core5Compat_DEFINITIONS})
include_directories(${Qt6Widgets_INCLUDE_DIRS})
add_definitions(${Qt6Widgets_DEFINITIONS})

find_package(Qt6 COMPONENTS Gui REQUIRED)
include_directories(${Qt6Gui_INCLUDE_DIRS})
add_definitions(${Qt6Gui_DEFINITIONS})
# include_directories(${Qt5Xml_INCLUDE_DIRS})

find_package(Qt6 COMPONENTS Widgets REQUIRED)
include_directories(${Qt6Widgets_INCLUDE_DIRS})
add_definitions(${Qt6Widgets_DEFINITIONS})

find_package(Qt6 COMPONENTS Network REQUIRED)
include_directories(${Qt6Network_INCLUDE_DIRS})
add_definitions(${Qt6Network_DEFINITIONS})


# include_directories(${Qt5Xml_INCLUDE_DIRS})
# add_definitions(${Qt5Xml_DEFINITIONS})
# include_directories(${Qt5Network_INCLUDE_DIRS})
# add_definitions(${Qt5Network_DEFINITIONS})

# include_directories(${Qt5OpenGL_INCLUDE_DIRS})
# add_definitions(${Qt5OpenGL_DEFINITIONS})
# include_directories(${Qt5PrintSupport_INCLUDE_DIRS})
Expand Down
60 changes: 35 additions & 25 deletions resources/translations/scribus.af.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3502,7 +3502,7 @@ Please choose another one.</source>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="40"/>
<source>&amp;Name:</source>
<translation type="unfinished">&amp;Naam:</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="66"/>
Expand All @@ -3522,12 +3522,12 @@ Please choose another one.</source>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="262"/>
<source>Cancel</source>
<translation type="unfinished">Kanselleer</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="113"/>
<source>New</source>
<translation type="unfinished">Nuut</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="135"/>
Expand All @@ -3537,30 +3537,30 @@ Please choose another one.</source>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="588"/>
<source>C:</source>
<translation type="unfinished">C:</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="550"/>
<location filename="../../scribus/ui/cmykfwbase.ui" line="601"/>
<location filename="../../scribus/ui/cmykfwbase.ui" line="620"/>
<location filename="../../scribus/ui/cmykfwbase.ui" line="652"/>
<source> %</source>
<translation type="unfinished">%</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="639"/>
<source>M:</source>
<translation type="unfinished">M:</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="671"/>
<source>Y:</source>
<translation type="unfinished">Y:</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/cmykfwbase.ui" line="518"/>
<source>K:</source>
<translation type="unfinished">K:</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -9074,7 +9074,7 @@ Document Liberation Project http://www.documentliberation.org</source>
</message>
<message>
<location filename="../../scribus/plugins/import/idml_old/importidml.cpp" line="66"/>
<source>Imports Adobe InDesign&apos;s IDML packages into Scribus
<source>Imports Adobe InDesign's IDML packages into Scribus
converting InDesign objects into Scribus pageitems; not all are supported in Scribus, but all those supported are being imported here</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -14961,7 +14961,7 @@ Please check it and try again.</source>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Attention:&lt;/span&gt; This script file contains code which &lt;span style=&quot; font-style:italic;&quot;&gt;might harm &lt;/span&gt;your system.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You should only permit execution of this script if you are sure that it comes from a trustworthy source. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
Expand All @@ -14977,7 +14977,7 @@ p, li { white-space: pre-wrap; }
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -21065,8 +21065,8 @@ Do you want to use this?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source></source>
<translation></translation>
<source/>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/prefs_userinterfacebase.ui" line="98"/>
Expand Down Expand Up @@ -28793,18 +28793,18 @@ not currently documented in the docstring for each function.
without a document to operate on.
- If you do not pass a frame name to a function that requires one,
the function will use the currently selected frame, if any, or
raise a NoValidObjectError if it can&apos;t find anything to operate
raise a NoValidObjectError if it can't find anything to operate
on.
- Many functions will raise WrongFrameTypeError if you try to use them
on a frame type that they do not make sense with. For example, setting
the text color on a graphics frame doesn&apos;t make sense, and will result
the text color on a graphics frame doesn't make sense, and will result
in this exception being raised.
- Errors resulting from calls to the underlying Python API will be
passed through unaltered. As such, the list of exceptions thrown by
any function as provided here and in its docstring is incomplete.

Details of what exceptions each function may throw are provided on the
function&apos;s documentation, though as with most Python code this list
function's documentation, though as with most Python code this list
is not exhaustive due to exceptions from called functions.
</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -29417,7 +29417,17 @@ is not exhaustive due to exceptions from called functions.
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/imagedataloaders/scimgdataloader_tiff.cpp" line="895"/>
<location filename="../../scribus/imagedataloaders/scimgdataloader_tiff.cpp" line="278"/>
<source>This image uses an unsupported non integer sample format</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/imagedataloaders/scimgdataloader_tiff.cpp" line="285"/>
<source>This image uses an unsupported bit depth: %1 bits per sample.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/imagedataloaders/scimgdataloader_tiff.cpp" line="905"/>
<source>%1 may be corrupted : missing resolution tags</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -30412,7 +30422,7 @@ Therefore the image may be not correct</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/scribusdoc.cpp" line="17988"/>
<location filename="../../scribus/scribusdoc.cpp" line="17985"/>
<source>Unacceptable settings for note style</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -33956,7 +33966,7 @@ Caution: this will increase the file size!</source>
<message>
<location filename="../../scribus/ui/scmwmenumanager.cpp" line="79"/>
<source>Document</source>
<translation type="unfinished">Dokument</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/ui/scmwmenumanager.cpp" line="80"/>
Expand Down Expand Up @@ -34264,13 +34274,13 @@ Vertical gap: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/scribusdoc.cpp" line="17615"/>
<location filename="../../scribus/scribusdoc.cpp" line="17654"/>
<location filename="../../scribus/scribusdoc.cpp" line="17612"/>
<location filename="../../scribus/scribusdoc.cpp" line="17651"/>
<source>No Style</source>
<translation>Geen Styl</translation>
</message>
<message>
<location filename="../../scribus/scribusdoc.cpp" line="17982"/>
<location filename="../../scribus/scribusdoc.cpp" line="17979"/>
<source>%1 note style has document as range and provide same numbering style as set %2</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -34667,13 +34677,13 @@ Consider using the Preflight Verifier to correct them</source>
</message>
<message>
<location filename="../../scribus/scribus.cpp" line="9486"/>
<location filename="../../scribus/scribus.cpp" line="9715"/>
<location filename="../../scribus/scribus.cpp" line="9714"/>
<source>Anchor mark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/scribus.cpp" line="9494"/>
<location filename="../../scribus/scribus.cpp" line="9728"/>
<location filename="../../scribus/scribus.cpp" line="9727"/>
<source>Mark with &lt;%1&gt; variable text</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -34862,7 +34872,7 @@ Consider using the Preflight Verifier to correct them</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../scribus/scribus.cpp" line="9697"/>
<location filename="../../scribus/scribus.cpp" line="9695"/>
<source>Edit %1</source>
<translation type="unfinished"></translation>
</message>
Expand Down
Loading