diff --git a/data/GtkGreeterSettingsWindow.ui b/data/GtkGreeterSettingsWindow.ui
index ef22903..30997cf 100644
--- a/data/GtkGreeterSettingsWindow.ui
+++ b/data/GtkGreeterSettingsWindow.ui
@@ -309,7 +309,7 @@
1
@@ -530,14 +530,12 @@
False
start
start
+ 24
Default user image
-
-
-
-
-
- 0
- 8
+
+
+ 0
+ 9
@@ -590,7 +588,7 @@
1
- 8
+ 9
@@ -634,7 +632,7 @@
@@ -649,6 +647,32 @@
0
4
2
+
+
+
+
+
+ 0
+ 8
+
+
+
+
+
+ 1
+ 8
diff --git a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
index bcb3c64..e75a4c4 100644
--- a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
+++ b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
@@ -84,6 +84,7 @@
'xft-hintstyle': (OptionEntry.ChoiceEntry, None),
'background': (OptionEntry.BackgroundEntry, '#000000'),
'user-background': (OptionEntry.BooleanEntry, 'true'),
+ 'hide-user-image': (OptionEntry.InvertedBooleanEntry, 'false'),
'default-user-image': (OptionEntry.IconEntry, '#avatar-default'),
# Panel
'clock-format': (OptionEntry.ClockFormatEntry, '%a, %H:%M'),
diff --git a/lightdm_gtk_greeter_settings/OptionEntry.py b/lightdm_gtk_greeter_settings/OptionEntry.py
index e022a5a..26ff7d0 100644
--- a/lightdm_gtk_greeter_settings/OptionEntry.py
+++ b/lightdm_gtk_greeter_settings/OptionEntry.py
@@ -30,7 +30,8 @@
from lightdm_gtk_greeter_settings.helpers import string2bool, bool2string
-__all__ = ['BaseEntry', 'BooleanEntry', 'StringEntry', 'StringPathEntry', 'ClockFormatEntry',
+__all__ = ['BaseEntry', 'BooleanEntry', 'InvertedBooleanEntry',
+ 'StringEntry', 'StringPathEntry', 'ClockFormatEntry',
'BackgroundEntry', 'IconEntry', 'IndicatorsEntry',
'AdjustmentEntry', 'ChoiceEntry']
@@ -136,6 +137,18 @@
def _set_enabled(self, value):
self._value.props.sensitive = value
+
+
+class InvertedBooleanEntry(BooleanEntry):
+
+ def __init__(self, widgets):
+ super().__init__(widgets)
+
+ def _get_value(self):
+ return bool2string(not self._value.props.active)
+
+ def _set_value(self, value):
+ self._value.props.active = not string2bool(value)
class StringEntry(BaseEntry):
@@ -337,8 +350,6 @@
self._path_dialog_preview = widgets['path_dialog_preview']
self._icon_dialog = None
- #self._icon_item.set_ic
-
self._button.connect('toggled', self._on_button_toggled)
self._menu.connect('hide', self._on_menu_hide)
self._icon_item.connect('activate', self._on_select_icon)
diff --git a/lightdm_gtk_greeter_settings/PositionEntry.py b/lightdm_gtk_greeter_settings/PositionEntry.py
new file mode 100644
index 0000000..eac3e3b
--- /dev/null
+++ b/lightdm_gtk_greeter_settings/PositionEntry.py
@@ -0,0 +1,218 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# LightDM GTK Greeter Settings
+# Copyright (C) 2014 Andrew P.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see .
+
+
+from gi.repository import Gtk
+from itertools import product
+from lightdm_gtk_greeter_settings.OptionEntry import BaseEntry
+from lightdm_gtk_greeter_settings.helpers import WidgetsWrapper
+
+
+__all__ = ['PositionEntry']
+
+
+class PositionEntry(BaseEntry):
+
+ class Dimension:
+ def __init__(self, widgets, on_changed):
+ self._entry = widgets['entry']
+ self._percents = widgets['percents']
+ self._mirror = widgets['mirror']
+ self._adjustment = widgets['adjustment']
+ self._on_changed = on_changed
+
+ self._anchor = None
+
+ self._percents.connect('toggled', self._on_percents_toggled)
+ self._mirror.connect('toggled', self._on_mirror_toggled)
+ self._on_value_changed_id = self._adjustment.connect('value-changed',
+ self._on_value_changed)
+
+ @property
+ def value(self):
+ return '%s%d%s,%s' % ('-' if self._mirror.props.active else '',
+ int(self._entry.props.value),
+ '%' if self._percents.props.active else '',
+ self._anchor)
+
+ @value.setter
+ def value(self, s):
+ value, _, anchor = s.partition(',')
+
+ percents = value and value[-1] == '%'
+ if percents:
+ value = value[:-1]
+
+ try:
+ p = int(value)
+ except ValueError:
+ p = 0
+
+ negative = (p < 0) or (p == 0 and value and value[0] == '-')
+
+ if not anchor or anchor not in ('start', 'center', 'end'):
+ if negative:
+ anchor = 'end'
+ else:
+ anchor = 'start'
+ self._anchor = anchor
+
+ self._percents.props.active = percents
+ self._adjustment.props.upper = 100 if self._percents.props.active else 10000
+ self._mirror.props.active = negative
+ with self._adjustment.handler_block(self._on_value_changed_id):
+ self._adjustment.props.value = -p if negative else p
+
+ @property
+ def anchor(self):
+ return self._anchor
+
+ @anchor.setter
+ def anchor(self, value):
+ self._anchor = value
+
+ def get_value_for_screen(self, screen: int):
+ p = int(self._adjustment.props.value)
+
+ if self._percents.props.active:
+ p = screen * p / 100
+ if self._mirror.props.active:
+ p = screen - p
+
+ return int(p)
+
+ def _on_percents_toggled(self, toggle):
+ self._adjustment.props.upper = 100 if toggle.props.active \
+ else 10000
+ self._on_changed(self)
+
+ def _on_mirror_toggled(self, toggle):
+ self._on_changed(self)
+
+ def _on_value_changed(self, widget):
+ self._on_changed(self)
+
+
+ ASSUMED_WINDOW_SIZE = 430, 240
+
+ def __init__(self, widgets):
+ super().__init__(widgets)
+
+ self._screen_size = None
+ self._last_overlay_size = None
+ self._last_window_allocation = None
+
+ self._screen_frame = widgets['screen_frame']
+ self._screen_overlay = widgets['screen_overlay']
+ self._window_frame = widgets['window_frame']
+ self._grid = widgets['window_grid']
+
+ # Creating points grid
+ anchors_align = (Gtk.Align.START, Gtk.Align.CENTER, Gtk.Align.END)
+ anchors = [(x, y, Gtk.RadioButton())
+ for x, y in product(enumerate(('start', 'center', 'end')), repeat=2)]
+
+ self._anchors = {}
+ for (left, x_anchor), (top, y_anchor), w in anchors:
+ w.props.halign = anchors_align[left]
+ w.props.valign = anchors_align[top]
+ w.props.group = anchors[0][-1]
+ w.connect('toggled', self._on_anchor_toggled, x_anchor, y_anchor)
+ self._grid.attach(w, left, top, 1, 1)
+ self._anchors[x_anchor, y_anchor] = w
+
+ self._grid.show_all()
+
+ self._x = PositionEntry.Dimension(WidgetsWrapper(widgets, 'x'), self._on_dimension_changed)
+ self._y = PositionEntry.Dimension(WidgetsWrapper(widgets, 'y'), self._on_dimension_changed)
+
+ self._on_gdk_screen_changed()
+
+ self._screen_overlay.connect('get-child-position', self._on_screen_overlay_get_child_position)
+ self._screen_overlay.connect('screen-changed', self._on_gdk_screen_changed)
+
+ def _get_value(self):
+ return self._x.value + ' ' + self._y.value
+
+ def _set_value(self, value):
+ if value:
+ x, _, y = value.partition(' ')
+ self._x.value = x
+ self._y.value = y or x
+ self._anchors[self._x.anchor, self._y.anchor].props.active = True
+
+ def _get_corrected_position(self, p, screen, window, anchor):
+ if anchor == 'center':
+ p -= window / 2
+ elif anchor == 'end':
+ p -= window
+
+ if p + window > screen:
+ p = screen - window
+ if p < 0:
+ p = 0
+
+ return int(p)
+
+ def _on_dimension_changed(self, dimension):
+ self._last_window_allocation = None
+ self._screen_overlay.queue_resize()
+ self._emit_changed()
+
+ def _on_screen_overlay_get_child_position(self, overlay, child, allocation):
+ screen = overlay.get_allocation()
+
+ if self._last_window_allocation and self._last_overlay_size == (screen.width, screen.height):
+ allocation.x, allocation.y, allocation.width, allocation.height = self._last_window_allocation
+ return True
+ self._last_overlay_size = screen.width, screen.height
+
+ scale = screen.width / self._screen_size[0]
+
+ width = int(self.ASSUMED_WINDOW_SIZE[0] * scale)
+ height = int(self.ASSUMED_WINDOW_SIZE[1] * scale)
+
+ # Set desired size
+ child.set_size_request(width, height)
+ # And check what actually we have now
+ width, height = child.size_request().width, child.size_request().height
+
+ x = self._get_corrected_position(int(self._x.get_value_for_screen(self._screen_size[0]) * scale),
+ screen.width, width, self._x.anchor)
+ y = self._get_corrected_position(int(self._y.get_value_for_screen(self._screen_size[1]) * scale),
+ screen.height, height, self._y.anchor)
+
+ self._last_window_allocation = x, y, width, height
+ allocation.x, allocation.y, allocation.width, allocation.height = x, y, width, height
+
+ return True
+
+ def _on_anchor_toggled(self, toggle, x, y):
+ if not toggle.props.active:
+ return
+ self._x.anchor = x
+ self._y.anchor = y
+ self._last_window_allocation = None
+ self._screen_overlay.queue_resize()
+ self._emit_changed()
+
+ def _on_gdk_screen_changed(self, widget = None, prev_screen = None):
+ screen = self._screen_overlay.get_toplevel().get_screen()
+ geometry = screen.get_monitor_geometry(screen.get_primary_monitor())
+ self._screen_size = geometry.width, geometry.height
+ self._screen_frame.props.ratio = geometry.width / geometry.height
+
+