From 296e495fbf25c5aae942c2570fdf88162ab97271 Mon Sep 17 00:00:00 2001 From: pztrn Date: Fri, 7 Oct 2016 17:23:50 +0500 Subject: [PATCH] About dialog fixes and lists columns upgrades. About dialog should now be fixed everywhere. Previously it causes crash on macOS and Windows. See https://github.com/mattn/go-gtk/issues/282 Columns now can be rearranged and resized. No saving or restoring yet. --- ui/about.go | 4 ++++ ui/mainwindow.go | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/ui/about.go b/ui/about.go index 3e8db3d..bc1cc23 100644 --- a/ui/about.go +++ b/ui/about.go @@ -35,6 +35,10 @@ func ShowAboutDialog() { artists = append(artists, "UrTConnector team, for great icons and allowing to use them.") ad.SetArtists(artists) + var documenters []string + documenters = append(documenters, "No one at this moment") + ad.SetDocumenters(documenters) + ad.SetCopyright("Stanislav N. aka pztrn") ad.SetLicense(GPL_LICENSE) diff --git a/ui/mainwindow.go b/ui/mainwindow.go index 8a07fe7..c3f39ce 100644 --- a/ui/mainwindow.go +++ b/ui/mainwindow.go @@ -627,31 +627,45 @@ func (m *MainWindow) InitializeTabs() { all_srv_name_column := gtk.NewTreeViewColumnWithAttributes("Name", gtk.NewCellRendererText(), "markup", 2) all_srv_name_column.SetSortColumnId(2) + all_srv_name_column.SetReorderable(true) + all_srv_name_column.SetResizable(true) m.all_servers.AppendColumn(all_srv_name_column) all_gamemode_column := gtk.NewTreeViewColumnWithAttributes("Mode", gtk.NewCellRendererText(), "text", 3) all_gamemode_column.SetSortColumnId(3) + all_gamemode_column.SetReorderable(true) + all_gamemode_column.SetResizable(true) m.all_servers.AppendColumn(all_gamemode_column) all_map_column := gtk.NewTreeViewColumnWithAttributes("Map", gtk.NewCellRendererText(), "text", 4) all_map_column.SetSortColumnId(4) + all_map_column.SetReorderable(true) + all_map_column.SetResizable(true) m.all_servers.AppendColumn(all_map_column) // ToDo: custom sorting function. all_players_column := gtk.NewTreeViewColumnWithAttributes("Players", gtk.NewCellRendererText(), "text", 5) all_players_column.SetSortColumnId(5) + all_players_column.SetReorderable(true) + all_players_column.SetResizable(true) m.all_servers.AppendColumn(all_players_column) all_ping_column := gtk.NewTreeViewColumnWithAttributes("Ping", gtk.NewCellRendererText(), "text", 6) all_ping_column.SetSortColumnId(6) + all_ping_column.SetReorderable(true) + all_ping_column.SetResizable(true) m.all_servers.AppendColumn(all_ping_column) all_version_column := gtk.NewTreeViewColumnWithAttributes("Version", gtk.NewCellRendererText(), "text", 7) all_version_column.SetSortColumnId(7) + all_version_column.SetReorderable(true) + all_version_column.SetResizable(true) m.all_servers.AppendColumn(all_version_column) all_ip_column := gtk.NewTreeViewColumnWithAttributes("IP", gtk.NewCellRendererText(), "text", 8) all_ip_column.SetSortColumnId(8) + all_ip_column.SetReorderable(true) + all_ip_column.SetResizable(true) m.all_servers.AppendColumn(all_ip_column) // Sorting. // By default we are sorting by server name. @@ -692,30 +706,44 @@ func (m *MainWindow) InitializeTabs() { fav_name_column := gtk.NewTreeViewColumnWithAttributes("Name", gtk.NewCellRendererText(), "markup", 2) fav_name_column.SetSortColumnId(2) + fav_name_column.SetReorderable(true) + fav_name_column.SetResizable(true) m.fav_servers.AppendColumn(fav_name_column) fav_mode_column := gtk.NewTreeViewColumnWithAttributes("Mode", gtk.NewCellRendererText(), "text", 3) fav_mode_column.SetSortColumnId(3) + fav_mode_column.SetReorderable(true) + fav_mode_column.SetResizable(true) m.fav_servers.AppendColumn(fav_mode_column) fav_map_column := gtk.NewTreeViewColumnWithAttributes("Map", gtk.NewCellRendererText(), "text", 4) fav_map_column.SetSortColumnId(4) + fav_map_column.SetReorderable(true) + fav_map_column.SetResizable(true) m.fav_servers.AppendColumn(fav_map_column) fav_players_column := gtk.NewTreeViewColumnWithAttributes("Players", gtk.NewCellRendererText(), "text", 5) fav_players_column.SetSortColumnId(5) + fav_players_column.SetReorderable(true) + fav_players_column.SetResizable(true) m.fav_servers.AppendColumn(fav_players_column) fav_ping_column := gtk.NewTreeViewColumnWithAttributes("Ping", gtk.NewCellRendererText(), "text", 6) fav_ping_column.SetSortColumnId(6) + fav_ping_column.SetReorderable(true) + fav_ping_column.SetResizable(true) m.fav_servers.AppendColumn(fav_ping_column) fav_version_column := gtk.NewTreeViewColumnWithAttributes("Version", gtk.NewCellRendererText(), "text", 7) fav_version_column.SetSortColumnId(7) + fav_version_column.SetReorderable(true) + fav_version_column.SetResizable(true) m.fav_servers.AppendColumn(fav_version_column) fav_ip_column := gtk.NewTreeViewColumnWithAttributes("IP", gtk.NewCellRendererText(), "text", 8) fav_ip_column.SetSortColumnId(8) + fav_ip_column.SetReorderable(true) + fav_ip_column.SetResizable(true) m.fav_servers.AppendColumn(fav_ip_column) // Selection changed signal, which will update server's short info pane.