I sense a double merge.
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
@@ -261,6 +261,7 @@ AdvanceExtraPixels=0
|
|||||||
253=12
|
253=12
|
||||||
254=15
|
254=15
|
||||||
255=12
|
255=12
|
||||||
|
|
||||||
[alt]
|
[alt]
|
||||||
0=10
|
0=10
|
||||||
1=10
|
1=10
|
||||||
@@ -390,3 +391,28 @@ AdvanceExtraPixels=0
|
|||||||
125=12
|
125=12
|
||||||
126=6
|
126=6
|
||||||
127=7
|
127=7
|
||||||
|
|
||||||
|
[polish]
|
||||||
|
Baseline=23
|
||||||
|
Top=6
|
||||||
|
|
||||||
|
line 0=ĄĆĘŁŃŚŹŻ
|
||||||
|
line 1=ąćęłńśźż
|
||||||
|
|
||||||
|
0=15
|
||||||
|
1=10
|
||||||
|
2=12
|
||||||
|
3=12
|
||||||
|
4=12
|
||||||
|
5=12
|
||||||
|
6=13
|
||||||
|
7=13
|
||||||
|
|
||||||
|
8=11
|
||||||
|
9=11
|
||||||
|
10=11
|
||||||
|
11=6
|
||||||
|
12=11
|
||||||
|
13=10
|
||||||
|
14=10
|
||||||
|
15=10
|
||||||
@@ -1236,6 +1236,7 @@ Write Profiles=Write Profiles
|
|||||||
off=off
|
off=off
|
||||||
on=on
|
on=on
|
||||||
or=or
|
or=or
|
||||||
|
Zoom In Camera=Zoom In Camera
|
||||||
|
|
||||||
[ScreenEdit]
|
[ScreenEdit]
|
||||||
%s notes=%s notes
|
%s notes=%s notes
|
||||||
|
|||||||
@@ -569,6 +569,7 @@ static LocalizedString WRITE_PREFERENCES ( "ScreenDebugOverlay", "Write Preferen
|
|||||||
static LocalizedString MENU_TIMER ( "ScreenDebugOverlay", "Menu Timer" );
|
static LocalizedString MENU_TIMER ( "ScreenDebugOverlay", "Menu Timer" );
|
||||||
static LocalizedString FLUSH_LOG ( "ScreenDebugOverlay", "Flush Log" );
|
static LocalizedString FLUSH_LOG ( "ScreenDebugOverlay", "Flush Log" );
|
||||||
static LocalizedString PULL_BACK_CAMERA ( "ScreenDebugOverlay", "Pull Back Camera" );
|
static LocalizedString PULL_BACK_CAMERA ( "ScreenDebugOverlay", "Pull Back Camera" );
|
||||||
|
static LocalizedString ZOOM_IN_CAMERA ( "ScreenDebugOverlay", "Zoom In Camera" );
|
||||||
static LocalizedString VISUAL_DELAY_UP ( "ScreenDebugOverlay", "Visual Delay Up" );
|
static LocalizedString VISUAL_DELAY_UP ( "ScreenDebugOverlay", "Visual Delay Up" );
|
||||||
static LocalizedString VISUAL_DELAY_DOWN ( "ScreenDebugOverlay", "Visual Delay Down" );
|
static LocalizedString VISUAL_DELAY_DOWN ( "ScreenDebugOverlay", "Visual Delay Down" );
|
||||||
static LocalizedString VOLUME_UP ( "ScreenDebugOverlay", "Volume Up" );
|
static LocalizedString VOLUME_UP ( "ScreenDebugOverlay", "Volume Up" );
|
||||||
@@ -1101,7 +1102,7 @@ class DebugLinePullBackCamera : public IDebugLine
|
|||||||
{
|
{
|
||||||
virtual RString GetDisplayTitle() { return PULL_BACK_CAMERA.GetValue(); }
|
virtual RString GetDisplayTitle() { return PULL_BACK_CAMERA.GetValue(); }
|
||||||
virtual RString GetDisplayValue() { return RString(); }
|
virtual RString GetDisplayValue() { return RString(); }
|
||||||
virtual bool IsEnabled() { return g_fImageScaleDestination != 1; }
|
virtual bool IsEnabled() { return g_fImageScaleDestination < 1.0f; }
|
||||||
virtual void DoAndLog( RString &sMessageOut )
|
virtual void DoAndLog( RString &sMessageOut )
|
||||||
{
|
{
|
||||||
if( g_fImageScaleDestination == 1 )
|
if( g_fImageScaleDestination == 1 )
|
||||||
@@ -1112,6 +1113,21 @@ class DebugLinePullBackCamera : public IDebugLine
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class DebugLineZoomInCamera : public IDebugLine
|
||||||
|
{
|
||||||
|
virtual RString GetDisplayTitle() { return ZOOM_IN_CAMERA.GetValue(); }
|
||||||
|
virtual RString GetDisplayValue() { return RString(); }
|
||||||
|
virtual bool IsEnabled() { return g_fImageScaleDestination > 1.0f; }
|
||||||
|
virtual void DoAndLog( RString &sMessageOut )
|
||||||
|
{
|
||||||
|
if( g_fImageScaleDestination == 1 )
|
||||||
|
g_fImageScaleDestination = 2.0f;
|
||||||
|
else
|
||||||
|
g_fImageScaleDestination = 1;
|
||||||
|
IDebugLine::DoAndLog( sMessageOut );
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
class DebugLineVolumeUp : public IDebugLine
|
class DebugLineVolumeUp : public IDebugLine
|
||||||
{
|
{
|
||||||
virtual RString GetDisplayTitle() { return VOLUME_UP.GetValue(); }
|
virtual RString GetDisplayTitle() { return VOLUME_UP.GetValue(); }
|
||||||
@@ -1226,6 +1242,7 @@ DECLARE_ONE( DebugLineWritePreferences );
|
|||||||
DECLARE_ONE( DebugLineMenuTimer );
|
DECLARE_ONE( DebugLineMenuTimer );
|
||||||
DECLARE_ONE( DebugLineFlushLog );
|
DECLARE_ONE( DebugLineFlushLog );
|
||||||
DECLARE_ONE( DebugLinePullBackCamera );
|
DECLARE_ONE( DebugLinePullBackCamera );
|
||||||
|
DECLARE_ONE( DebugLineZoomInCamera );
|
||||||
DECLARE_ONE( DebugLineVolumeUp );
|
DECLARE_ONE( DebugLineVolumeUp );
|
||||||
DECLARE_ONE( DebugLineVolumeDown );
|
DECLARE_ONE( DebugLineVolumeDown );
|
||||||
DECLARE_ONE( DebugLineVisualDelayUp );
|
DECLARE_ONE( DebugLineVisualDelayUp );
|
||||||
|
|||||||
Reference in New Issue
Block a user