From 60fa629857550dcb3d000ff875b310364ae9c6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Sat, 20 Jan 2018 11:58:40 +0100
Subject: [PATCH] Set new default for projector resolution (1220x915, Fixed
 #2549).

---
 CHANGELOG                                        | 1 +
 openslides/core/migrations/0002_misc_features.py | 4 ++--
 tests/integration/core/test_views.py             | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 359658230..039c03f15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -104,6 +104,7 @@ Core:
 - Added projector prioritization [#3425].
 - Use native twisted mode for daphne [#3487].
 - Save language selection to session storage [#3543]
+- Set default of projector resolution to 1220x915 [#2549].
 
 Mediafiles:
 - Fixed reloading of PDF on page change [#3274].
diff --git a/openslides/core/migrations/0002_misc_features.py b/openslides/core/migrations/0002_misc_features.py
index 93c389356..9a18f5c41 100644
--- a/openslides/core/migrations/0002_misc_features.py
+++ b/openslides/core/migrations/0002_misc_features.py
@@ -209,7 +209,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='projector',
             name='height',
-            field=models.PositiveIntegerField(default=768),
+            field=models.PositiveIntegerField(default=915),
         ),
         migrations.AddField(
             model_name='projector',
@@ -219,7 +219,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='projector',
             name='width',
-            field=models.PositiveIntegerField(default=1024),
+            field=models.PositiveIntegerField(default=1220),
         ),
         migrations.AddField(
             model_name='projectiondefault',
diff --git a/tests/integration/core/test_views.py b/tests/integration/core/test_views.py
index d793e2301..940b095be 100644
--- a/tests/integration/core/test_views.py
+++ b/tests/integration/core/test_views.py
@@ -60,8 +60,8 @@ class ProjectorAPI(TestCase):
             'scroll': 0,
             'name': 'Default projector',
             'blank': False,
-            'width': 1024,
-            'height': 768})
+            'width': 1220,
+            'height': 915})
 
 
 class VersionView(TestCase):