Skip to content

Commit

Permalink
Simplify user list
Browse files Browse the repository at this point in the history 
Go back to a simple vbox
  • Loading branch information
@clefebvre
clefebvre committed Mar 11, 2024
1 parent 7b1f28e commit 3926423
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 87 deletions.
12 changes: 0 additions & 12 deletions usr/lib/jargonaut/jargonaut.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ def do_activate(self):
self.user_treeview.set_model(self.user_store)
self.user_store.set_sort_column_id(1, Gtk.SortType.ASCENDING)

self.user_list_sw = self.builder.get_object("treeview_users_sw")
self.user_list_box = self.builder.get_object("user_list_box")
self.user_list_box.set_visible(self.settings.get_boolean("user-list-visible"))
self.current_paned_position = 0
Expand Down Expand Up @@ -283,7 +282,6 @@ def on_join(self, connection, event):
self.update_users()
if nick == self.nickname:
self.builder.get_object("main_stack").set_visible_child_name("page_chat")
self.size_user_list()
self.entry.grab_focus()
self.identify(connection)
else:
Expand Down Expand Up @@ -576,12 +574,6 @@ def is_window_focused(self):
focused = self.window.is_active() and self.window.get_visible()
return focused

@idle
def size_user_list(self):
stored_sidebar_width = self.settings.get_int("sidebar-width")
paned_max = self.chat_paned.props.max_position
self.chat_paned.set_position(paned_max + self.user_list_sw.get_min_content_width() - stored_sidebar_width)

def on_back_button_clicked(self, widget):
self.builder.get_object("main_stack").set_visible_child_name("page_chat")
self.builder.get_object("back_button").set_visible(False)
Expand Down Expand Up @@ -683,10 +675,6 @@ def do_shutdown(self):
if self.is_connected:
self.disconnect()

# 50 is our minimum content width for the user list scrolled window,
# so that needs to be accounted for, because max_position is affected by it.
saved_width = self.chat_paned.props.max_position + self.user_list_sw.get_min_content_width() - self.chat_paned.get_position()
self.settings.set_int("sidebar-width", saved_width)
Gtk.Application.do_shutdown(self)

app = App()
Expand Down
5 changes: 0 additions & 5 deletions usr/share/glib-2.0/schemas/org.x.jargonaut.gschema.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,5 @@
<default>false</default>
<summary>Whether to print debug information to stdout</summary>
</key>
<key name="sidebar-width" type="i">
<range min="0" max="99999"/>
<default>150</default>
</key>

</schema>
</schemalist>
104 changes: 34 additions & 70 deletions usr/share/jargonaut/jargonaut.ui
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.40.0 -->
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<object class="GtkMenu" id="main_menu">
Expand Down Expand Up @@ -102,98 +102,62 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkPaned" id="chat_paned">
<object class="GtkBox" id="webview_box">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="position">300</property>
<property name="position-set">True</property>
<property name="wide-handle">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="user_list_box">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox" id="webview_box">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="user_list_box">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="no-show-all">True</property>
<property name="can-focus">True</property>
<property name="min-content-width">150</property>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="treeview_users_sw">
<object class="GtkTreeView" id="treeview_users">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="min-content-width">50</property>
<child>
<object class="GtkTreeView" id="treeview_users">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="headers-visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object>
<property name="headers-visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">False</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
</object>
Expand Down

0 comments on commit 3926423

Please sign in to comment.