Rename 'tracking_recent_activities_items' to 'count'

projecthamster · Sep 27, 2017 · 82fad51 · 82fad51
1 parent 95fc765
commit 82fad51
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/hamster_gtk/hamster_gtk.py b/hamster_gtk/hamster_gtk.py
@@ -286,7 +286,7 @@ def _get_default_config(self):
             'autocomplete_activities_range': 30,
             'autocomplete_split_activity': False,
             'tracking_show_recent_activities': True,
-            'tracking_recent_activities_items': 6,
+            'tracking_recent_activities_count': 6,
         }
 
     def _config_to_configparser(self, config):
@@ -326,8 +326,8 @@ def get_autocomplete_split_activity():
         def get_tracking_show_recent_activities():
             return text_type(config['tracking_show_recent_activities'])
 
-        def get_tracking_recent_activities_items():
-            return text_type(config['tracking_recent_activities_items'])
+        def get_tracking_recent_activities_count():
+            return text_type(config['tracking_recent_activities_count'])
 
         cp_instance = SafeConfigParser()
         cp_instance.add_section('Backend')
@@ -345,8 +345,8 @@ def get_tracking_recent_activities_items():
                         get_autocomplete_split_activity())
         cp_instance.set('Frontend', 'tracking_show_recent_activities',
                         get_tracking_show_recent_activities())
-        cp_instance.set('Frontend', 'tracking_recent_activities_items',
-                        get_tracking_recent_activities_items())
+        cp_instance.set('Frontend', 'tracking_recent_activities_count',
+                        get_tracking_recent_activities_count())
 
         return cp_instance
 
@@ -406,8 +406,8 @@ def get_autocomplete_split_activity():
         def get_tracking_show_recent_activities():
             return cp_instance.getboolean('Frontend', 'tracking_show_recent_activities')
 
-        def get_tracking_recent_activities_items():
-            return int(cp_instance.get('Frontend', 'tracking_recent_activities_items'))
+        def get_tracking_recent_activities_count():
+            return int(cp_instance.get('Frontend', 'tracking_recent_activities_count'))
 
         result = {
             'store': get_store(),
@@ -416,8 +416,8 @@ def get_tracking_recent_activities_items():
             'tmpfile_path': get_tmpfile_path(),
             'autocomplete_activities_range': get_autocomplete_activities_range(),
             'autocomplete_split_activity': get_autocomplete_split_activity(),
-            'tracking_show_recent_activities': get_tracking_recent_activities_items(),
-            'tracking_recent_activities_items': get_tracking_recent_activities_items(),
+            'tracking_show_recent_activities': get_tracking_show_recent_activities(),
+            'tracking_recent_activities_count': get_tracking_recent_activities_count(),
         }
         result.update(get_db_config())
         return result

diff --git a/hamster_gtk/preferences/preferences_dialog.py b/hamster_gtk/preferences/preferences_dialog.py
@@ -83,7 +83,7 @@ def __init__(self, parent, app, initial, *args, **kwargs):
                 ('tracking_show_recent_activities',
                  (_("Show recent activities for quickly starting tracking."),
                   HamsterSwitch())),
-                ('tracking_recent_activities_items', (_('How many recent activities?'),
+                ('tracking_recent_activities_count', (_('How many recent activities?'),
                     HamsterSpinButton(SimpleAdjustment(0, GObject.G_MAXDOUBLE, 1)))),
             ]))),
         ]

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -114,6 +114,6 @@ def config(request, tmpdir):
         'autocomplete_activities_range': 30,
         'autocomplete_split_activity': False,
         'tracking_show_recent_activities': True,
-        'tracking_recent_activities_items': 6,
+        'tracking_recent_activities_count': 6,
     }
     return config