- fixed copy&paste shortcuts

- fixed error when a Quake Live servers has a non-integer teamsize (0.5) - fixed servers not showing up after pasting to a manual server list - removed option "remember column layout for each tab" (it's now always on)
PredatH0r · Nov 3, 2015 · 00e6457 · 00e6457
1 parent 25c936d
commit 00e6457
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 87 deletions.
diff --git a/ServerBrowser/Games/QuakeLive.cs b/ServerBrowser/Games/QuakeLive.cs
@@ -190,7 +190,8 @@ public override string GetCleanPlayerName(Player player)
       var ts = row.GetRule("teamsize");
       if (!string.IsNullOrEmpty(ts))
       {
-        var n = int.Parse(ts);
+        int n;
+        int.TryParse(ts, out n);
         if (n != 0)
           return n*2;
       }

diff --git a/ServerBrowser/ServerBrowser.csproj b/ServerBrowser/ServerBrowser.csproj
@@ -188,6 +188,9 @@
       <DependentUpon>ConnectingWaitForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Win32.cs" />
+    <Compile Include="XBarManager.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="XWebClient.cs" />
     <EmbeddedResource Include="Games\QuakeLiveOptionsDialog.resx">
       <DependentUpon>QuakeLiveOptionsDialog.cs</DependentUpon>

diff --git a/ServerBrowser/ServerBrowserForm.Designer.cs b/ServerBrowser/ServerBrowserForm.Designer.cs
diff --git a/ServerBrowser/ServerBrowserForm.cs b/ServerBrowser/ServerBrowserForm.cs
@@ -30,7 +30,7 @@ namespace ServerBrowser
 {
   public partial class ServerBrowserForm : XtraForm
   {
-    private const string Version = "2.13";
+    private const string Version = "2.14";
     private const string DevExpressVersion = "v15.1";
     private const string CustomDetailColumnPrefix = "ServerInfo.";
     private const string CustomRuleColumnPrefix = "custRule.";
@@ -51,7 +51,6 @@ public partial class ServerBrowserForm : XtraForm
     private readonly IniFile iniFile;
     private XtraTabPage dragPage;
     private const int PredefinedTabCount = 2;
-    private List<ServerRow> filteredServers = new List<ServerRow>();
 
     #region ctor()
     public ServerBrowserForm()
@@ -387,7 +386,6 @@ private int ApplyAppSettingsFromIni(IniFile ini, IniFile.Section options, out st
       this.cbNoUpdateWhilePlaying.Checked = !options.GetBool("AutoUpdateWhilePlaying");
       this.cbFavServersOnTop.Checked = options.GetBool("KeepFavServersOnTop", true);
       this.cbHideUnresponsiveServers.Checked = options.GetBool("HideUnresponsiveServers", true);
-      this.cbRememberColumnLayout.Checked = options.GetBool("ColumnLayoutPerTab", true);
       this.cbShowFilterPanelInfo.Checked = options.GetBool("ShowFilterPanelInfo", true);
       this.cbShowCounts.Checked = options.GetBool("ShowServerCounts", true);
 
@@ -464,7 +462,6 @@ protected virtual void SaveAppSettings(StringBuilder sb)
       sb.AppendLine($"AutoUpdateWhilePlaying={!this.cbNoUpdateWhilePlaying.Checked}");
       sb.AppendLine($"Skin={UserLookAndFeel.Default.SkinName}");
       sb.AppendLine($"TabIndex={this.tabControl.SelectedTabPageIndex}");
-      sb.AppendLine($"ColumnLayoutPerTab={this.cbRememberColumnLayout.Checked}");
       sb.AppendLine($"ShowFilterPanelInfo={this.cbShowFilterPanelInfo.Checked}");
       sb.AppendLine($"ShowServerCounts={this.cbShowCounts.Checked}");
 
@@ -561,12 +558,9 @@ protected virtual void UpdateViewModel()
       vm.TagsExcludeClient = this.btnTagExcludeClient.Text;
 
       vm.GridFilter = this.gvServers.ActiveFilterString;
-      if (this.cbRememberColumnLayout.Checked)
-      {
-        var strm = new MemoryStream();
-        this.gvServers.SaveLayoutToStream(strm);
-        vm.ServerGridLayout = strm;
-      }
+      var strm = new MemoryStream();
+      this.gvServers.SaveLayoutToStream(strm);
+      vm.ServerGridLayout = strm;
       vm.serverSource = this.CreateServerSource(vm.MasterServer);
       vm.gameExtension = this.extenders.Get((Game)vm.InitialGameID);
 
@@ -648,18 +642,16 @@ private void InitGameExtension()
       this.gvServers.BeginUpdate();
       this.ResetGridColumns(this.gvServers);
       this.viewModel.gameExtension.CustomizeServerGridColumns(gvServers);
-      if (this.cbRememberColumnLayout.Checked)
+      foreach (var custCol in this.viewModel.CustomDetailColumns)
       {
-        foreach (var custCol in this.viewModel.CustomDetailColumns)
-        {
-          var col = this.viewModel.gameExtension.AddColumn(this.gvServers, CustomDetailColumnPrefix + custCol, custCol, null);
-          col.UnboundType = UnboundColumnType.Bound;
-        }
-        foreach (var custCol in this.viewModel.CustomRuleColumns)
-          this.viewModel.gameExtension.AddColumn(this.gvServers, CustomRuleColumnPrefix + custCol, custCol, null);
+        var col = this.viewModel.gameExtension.AddColumn(this.gvServers, CustomDetailColumnPrefix + custCol, custCol, null);
+        col.UnboundType = UnboundColumnType.Bound;
       }
+      foreach (var custCol in this.viewModel.CustomRuleColumns)
+        this.viewModel.gameExtension.AddColumn(this.gvServers, CustomRuleColumnPrefix + custCol, custCol, null);
       this.gvServers.EndUpdate();
-      if (viewModel.ServerGridLayout != null && this.cbRememberColumnLayout.Checked)
+
+      if (viewModel.ServerGridLayout != null)
       {
         viewModel.ServerGridLayout.Seek(0, SeekOrigin.Begin);
         this.gvServers.RestoreLayoutFromStream(viewModel.ServerGridLayout);
@@ -732,8 +724,8 @@ private void RefreshServerInfo()
         return;
       this.miStopUpdate.Enabled = true;
       this.timerReloadServers.Stop();
-      this.SetStatusMessage("Updating status of " + this.filteredServers.Count + " servers...");
-      this.queryLogic.RefreshAllServers(this.filteredServers);
+      this.SetStatusMessage("Updating status of " + this.viewModel.servers.Count + " servers...");
+      this.queryLogic.RefreshAllServers(this.viewModel.servers);
       if (this.spinRefreshInterval.Value > 0)
         this.timerReloadServers.Start();
     }
@@ -846,24 +838,14 @@ protected void UpdateViews(bool forceUpdateDetails = false)
       this.LookupGeoIps();
       this.UpdateCachedServerNames();
 
-      //this.filteredServers.Clear();
-      //if (this.viewModel.servers != null)
-      //{
-      //  if (this.cbHideUnresponsiveServers.Checked)
-      //    this.filteredServers.AddRange(this.viewModel.servers.Where(s => s.ServerInfo != null && s.ServerInfo.Ping != 0 && !s.Status.StartsWith("Timeout")));
-      //  else
-      //    this.filteredServers.AddRange(this.viewModel.servers);
-      //}
-      //this.gcServers.DataSource = filteredServers; // always use the same object reference, otherwise all state (top-row, focused, selected) would get lost
-      this.filteredServers = this.viewModel.servers;
       this.gcServers.DataSource = this.viewModel.servers;
       this.gvServers.EndDataUpdate();
       //this.gvServers.RefreshData();
 
       if (this.viewModel.lastSelectedServer != null)
       {
         int i = 0;
-        foreach (var server in filteredServers)
+        foreach (var server in this.viewModel.servers)
         {
           if (server.EndPoint.Equals(this.viewModel.lastSelectedServer.EndPoint))
           {
@@ -1537,9 +1519,10 @@ private void txtGameServer_ButtonClick(object sender, ButtonPressedEventArgs e)
           serverRow = new ServerRow(endpoint, this.extenders.Get(0));
           this.viewModel.servers.Add(serverRow);
           this.gvServers.EndDataUpdate();
+          serverRow.SetModified();
           var handle = this.gvServers.GetRowHandle(this.viewModel.servers.Count - 1);
           this.gvServers.FocusedRowHandle = handle;
-          this.gvServers.SelectRow(handle);
+          this.gvServers.SelectRow(handle);          
         }
         this.queryLogic.RefreshSingleServer(serverRow);
       }
@@ -1658,7 +1641,7 @@ private void timerUpdateServerList_Tick(object sender, EventArgs e)
     #region gvServers_CustomRowFilter
     private void gvServers_CustomRowFilter(object sender, RowFilterEventArgs e)
     {
-      var row = this.filteredServers[e.ListSourceRow];
+      var row = this.viewModel.servers[e.ListSourceRow];
 
       if (FilterServerRow(row))
       {
@@ -1922,6 +1905,8 @@ private void miPasteAddress_ItemClick(object sender, ItemClickEventArgs e)
     {
       if (this.viewModel.Source != TabViewModel.SourceType.CustomList)
         return;
+      this.gvServers.BeginDataUpdate();
+
       try
       {
         var text = Clipboard.GetText();
@@ -1934,14 +1919,19 @@ private void miPasteAddress_ItemClick(object sender, ItemClickEventArgs e)
             var endpoint = Ip4Utils.ParseEndpoint(addr);
             var row = this.viewModel.servers.FirstOrDefault(r => r.EndPoint.Equals(endpoint));
             if (row == null)
-              this.viewModel.servers.Add(new ServerRow(endpoint, unknownGame));
+            {
+              row = new ServerRow(endpoint, unknownGame);
+              row.SetModified();
+              this.viewModel.servers.Add(row);
+              this.queryLogic.RefreshSingleServer(row);
+            }
           }
         }
       }
       catch
       {
       }
-      this.UpdateViews();
+      this.gvServers.EndDataUpdate();
     }
     #endregion