ralsina/xrandroll
1
0
Fork 0
mirror of https://github.com/ralsina/xrandroll.git synced 2024-11-24 03:52:22 +00:00
Code Issues Projects Releases Wiki Activity

made other bits work

Browse Source
This commit is contained in:
Roberto Alsina 2020-02-05 19:52:06 -03:00
parent 1d8769c334
commit 841ce1ba3b
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
xrandroll/main.py
View File

@ -83,7 +83,6 @@ class Window(QObject):
self.ui.screenCombo.currentTextChanged.connect(self.monitor_selected) self.ui.screenCombo.currentTextChanged.connect(self.monitor_selected)
self.ui.replicaOf.currentTextChanged.connect(self.replica_changed) self.ui.replicaOf.currentTextChanged.connect(self.replica_changed)
self.ui.orientationCombo.currentIndexChanged.connect(self.orientation_changed) self.ui.orientationCombo.currentIndexChanged.connect(self.orientation_changed)
self.xrandr_info = {}
self.get_xrandr_info() self.get_xrandr_info()
self.fill_ui() self.fill_ui()
self.ui.horizontalScale.valueChanged.connect(self.scale_changed) self.ui.horizontalScale.valueChanged.connect(self.scale_changed)
@ -104,15 +103,15 @@ class Window(QObject):
mon = self.ui.screenCombo.currentText() mon = self.ui.screenCombo.currentText()
enabled = self.ui.enabled.isChecked() enabled = self.ui.enabled.isChecked()
print(f"Setting {mon} enabled status to {enabled}") print(f"Setting {mon} enabled status to {enabled}")
monitor = self.xrandr_info[mon] monitor = self.screen.monitors[mon]
monitor["enabled"] = enabled monitor.enabled = enabled
if enabled and not monitor["current_mode"]: if enabled and not monitor.get_current_mode():
# Choose a mode # Choose a mode
self.ui.modes.setCurrentIndex(0) self.ui.modes.setCurrentText(monitor.get_preferred_mode_name())
self.mode_changed() self.mode_changed()
self.update_replica_of_data() self.screen.update_replica_of()
for _, mon in self.xrandr_info.items(): for mon in self.screen.monitors.values():
mon["item"].update_visuals(mon) mon.item.update_visuals(mon)
self.adjust_view() self.adjust_view()
def primary_changed(self): def primary_changed(self):
@ -123,14 +122,8 @@ class Window(QObject):
else: else:
self.screen.set_primary("foobar") # no primary self.screen.set_primary("foobar") # no primary
# TODO Update visuals on all monitos for monitor in self.screen.monitors.values():
# for name, monitor in self.xrandr_info.items(): monitor.item.update_visuals(monitor)
# if name == mon:
# monitor["primary"] = primary
# else:
# if primary: # There can only be one primary
# monitor["primary"] = False
# monitor["item"].update_visuals(monitor)
def scale_mode_changed(self): def scale_mode_changed(self):
mon = self.ui.screenCombo.currentText() mon = self.ui.screenCombo.currentText()
@ -287,14 +280,14 @@ class Window(QObject):
self.pos_label.resize(self.pos_label.sizeHint()) self.pos_label.resize(self.pos_label.sizeHint())
def monitor_moved(self): def monitor_moved(self):
"Update xrandr_info with new monitor positions" "Update screen with new monitor positions"
for _, mon in self.xrandr_info.items(): for mon in self.screen.monitors.values():
item = mon["item"] item = mon.item
mon["pos_x"] = item.x() mon.pos_x = item.x()
mon["pos_y"] = item.y() mon.pos_y = item.y()
self.screen.update_replica_of() self.screen.update_replica_of()
for _, mon in self.xrandr_info.items(): for mon in self.screen.monitors.values():
mon["item"].update_visuals(mon) mon.item.update_visuals(mon)
self.adjust_view() self.adjust_view()
def possible_snaps(self, name): def possible_snaps(self, name):
@ -347,7 +340,7 @@ class Window(QObject):
mode = monitor.get_current_mode() mode = monitor.get_current_mode()
self.ui.modes.setCurrentText(mode.name) self.ui.modes.setCurrentText(mode.name)
if monitor.orientation in (0, 2): if monitor.orientation in ("normal", "inverted"):
h_scale = monitor.res_x / mode.res_x h_scale = monitor.res_x / mode.res_x
v_scale = monitor.res_y / mode.res_y v_scale = monitor.res_y / mode.res_y
else: else:
@ -362,10 +355,10 @@ class Window(QObject):
self.ui.replicaOf.clear() self.ui.replicaOf.clear()
self.ui.replicaOf.addItem("None") self.ui.replicaOf.addItem("None")
for mon in self.xrandr_info: for mon in self.screen.monitors:
if mon != name: if mon != name:
self.ui.replicaOf.addItem(mon) self.ui.replicaOf.addItem(mon)
if mon in self.xrandr_info[name]["replica_of"]: if mon in self.screen.monitors[name].replica_of:
self.ui.replicaOf.setCurrentText(mon) self.ui.replicaOf.setCurrentText(mon)
self.ui.modes.blockSignals(False) self.ui.modes.blockSignals(False)

6
xrandroll/monitor.py
View File

@ -114,6 +114,12 @@ class Monitor:
for k, v in self.modes.items(): for k, v in self.modes.items():
v.current = k == mode_name v.current = k == mode_name
def get_preferred_mode_name(self):
for k, v in self.modes.items():
if v.preferred:
return k
return None
def guess_scale_mode(self): def guess_scale_mode(self):
"""Given a monitor's data, try to guess what scaling """Given a monitor's data, try to guess what scaling
mode it's using. mode it's using.