r19637 by jghali - #12819: backport fix for non working translation
scribus-commit
scribus-commit at lists.scribus.net
Sun Nov 23 12:53:20 UTC 2014
Author: jghali
Date: Sun Nov 23 12:53:20 2014
New Revision: 19637
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19637
Log:
#12819: backport fix for non working translation
Modified:
branches/Version14x/Scribus/scribus/CMakeLists.txt
branches/Version14x/Scribus/scribus/canvasmode_eyedropper.h
branches/Version14x/Scribus/scribus/canvasmode_framelinks.cpp
branches/Version14x/Scribus/scribus/canvasmode_framelinks.h
branches/Version14x/Scribus/scribus/canvasmode_legacy.cpp
branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj
branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj.filters
branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.vcproj
Modified: branches/Version14x/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19637&path=/branches/Version14x/Scribus/scribus/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/scribus/CMakeLists.txt (original)
+++ branches/Version14x/Scribus/scribus/CMakeLists.txt Sun Nov 23 12:53:20 2014
@@ -89,6 +89,8 @@
canvasgesture_rulermove.h
canvasmode.h
canvasmode_edit.h
+ canvasmode_eyedropper.h
+ canvasmode_framelinks.h
canvasmode_legacy.h
canvasmode_measurements.h
canvasmode_normal.h
Modified: branches/Version14x/Scribus/scribus/canvasmode_eyedropper.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19637&path=/branches/Version14x/Scribus/scribus/canvasmode_eyedropper.h
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_eyedropper.h (original)
+++ branches/Version14x/Scribus/scribus/canvasmode_eyedropper.h Sun Nov 23 12:53:20 2014
@@ -26,6 +26,8 @@
class CanvasMode_EyeDropper : public CanvasMode
{
+ Q_OBJECT
+
public:
CanvasMode_EyeDropper(ScribusView* view);
Modified: branches/Version14x/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19637&path=/branches/Version14x/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_framelinks.cpp (original)
+++ branches/Version14x/Scribus/scribus/canvasmode_framelinks.cpp Sun Nov 23 12:53:20 2014
@@ -209,15 +209,15 @@
{
//CB Mouse is released when this messagebox takes focus
m_canvas->m_viewMode.m_MouseButtonPressed = false;
- QMessageBox::warning(m_view, ScribusView::tr("Linking Text Frames"),
- "<qt>" + ScribusView::tr("You are trying to link a frame to itself.") + "</qt>");
+ QMessageBox::warning(m_view, tr("Linking Text Frames"),
+ "<qt>" + tr("You are trying to link a frame to itself.") + "</qt>");
}
else
{
//CB Mouse is released when this messagebox takes focus
m_canvas->m_viewMode.m_MouseButtonPressed = false;
- QMessageBox::warning(m_view, ScribusView::tr("Linking Text Frames"),
- "<qt>" + ScribusView::tr("You are trying to link a frame which is already linked.") + "</qt>");
+ QMessageBox::warning(m_view, tr("Linking Text Frames"),
+ "<qt>" + tr("You are trying to link a frame which is already linked.") + "</qt>");
}
}
else
Modified: branches/Version14x/Scribus/scribus/canvasmode_framelinks.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19637&path=/branches/Version14x/Scribus/scribus/canvasmode_framelinks.h
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_framelinks.h (original)
+++ branches/Version14x/Scribus/scribus/canvasmode_framelinks.h Sun Nov 23 12:53:20 2014
@@ -37,6 +37,8 @@
class CanvasMode_FrameLinks : public CanvasMode
{
+ Q_OBJECT
+
public:
CanvasMode_FrameLinks(ScribusView* view);
Modified: branches/Version14x/Scribus/scribus/canvasmode_legacy.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19637&path=/branches/Version14x/Scribus/scribus/canvasmode_legacy.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_legacy.cpp (original)
+++ branches/Version14x/Scribus/scribus/canvasmode_legacy.cpp Sun Nov 23 12:53:20 2014
@@ -1963,7 +1963,7 @@
//CB Mouse is released when this messagebox takes focus
m_canvas->m_viewMode.m_MouseButtonPressed = false;
QMessageBox::warning(m_view, ScribusView::tr("Linking Text Frames"),
- "<qt>" + ScribusView::tr("You are trying to link a frame to itself.") + "</qt>");
+ "<qt>" + ScribusView::tr("You are trying to link a frame to itself.") + "</qt>");
}
else
{
Modified: branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19637&path=/branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj Sun Nov 23 12:53:20 2014
@@ -278,8 +278,8 @@
<ClInclude Include="..\..\..\scribus\canvasmode_drawfreehand.h" />
<moc Include="..\..\..\scribus\canvasmode_edit.h" />
<ClInclude Include="..\..\..\scribus\canvasmode_editgradient.h" />
- <ClInclude Include="..\..\..\scribus\canvasmode_eyedropper.h" />
- <ClInclude Include="..\..\..\scribus\canvasmode_framelinks.h" />
+ <moc Include="..\..\..\scribus\canvasmode_eyedropper.h" />
+ <moc Include="..\..\..\scribus\canvasmode_framelinks.h" />
<moc Include="..\..\..\scribus\canvasmode_legacy.h" />
<ClInclude Include="..\..\..\scribus\canvasmode_magnifier.h" />
<moc Include="..\..\..\scribus\canvasmode_measurements.h" />
@@ -735,6 +735,8 @@
<ClCompile Include="..\..\..\scribus\canvasmode_rotate.cpp" />
<ClCompile Include="..\..\..\scribus\charselect.cpp" />
<ClCompile Include="..\..\..\scribus\charselectenhanced.cpp" />
+ <ClCompile Include="..\..\..\scribus\moc_canvasmode_eyedropper.cpp" />
+ <ClCompile Include="..\..\..\scribus\moc_canvasmode_framelinks.cpp" />
<ClCompile Include="..\..\..\scribus\moc_scescapecatcher.cpp" />
<ClCompile Include="..\..\..\scribus\scescapecatcher.cpp" />
<ClCompile Include="..\..\..\scribus\styles\charstyle.cpp" />
Modified: branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19637&path=/branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj.filters
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj.filters (original)
+++ branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj.filters Sun Nov 23 12:53:20 2014
@@ -2531,6 +2531,12 @@
<ClCompile Include="..\..\..\scribus\moc_scescapecatcher.cpp">
<Filter>Generated Moc Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\scribus\moc_canvasmode_eyedropper.cpp">
+ <Filter>Generated Moc Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\moc_canvasmode_framelinks.cpp">
+ <Filter>Generated Moc Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="scribus.rc">
Modified: branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19637&path=/branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.vcproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.vcproj (original)
+++ branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.vcproj Sun Nov 23 12:53:20 2014
@@ -2308,10 +2308,38 @@
<File
RelativePath="..\..\..\scribus\canvasmode_eyedropper.h"
>
+ <FileConfiguration
+ Name="Debug-cairo|Win32"
+ >
+ <Tool
+ Name="moc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-cairo|Win32"
+ >
+ <Tool
+ Name="moc"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\scribus\canvasmode_framelinks.h"
>
+ <FileConfiguration
+ Name="Debug-cairo|Win32"
+ >
+ <Tool
+ Name="moc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-cairo|Win32"
+ >
+ <Tool
+ Name="moc"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\scribus\canvasmode_legacy.h"
@@ -6992,6 +7020,14 @@
>
</File>
<File
+ RelativePath="..\..\..\scribus\moc_canvasmode_eyedropper.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\scribus\moc_canvasmode_framelinks.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\scribus\moc_canvasmode_legacy.cpp"
>
</File>
More information about the scribus-commit
mailing list