Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
* Monsoon/MainWindow.cs: Ensure that the width/height is restored
Browse files Browse the repository at this point in the history
  correctly. Nuke some old CWLs.

svn path=/trunk/monsoon/; revision=131596
  • Loading branch information
alanmcgovern committed Apr 13, 2009
1 parent 8979b6a commit 1c98ba2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
5 changes: 5 additions & 0 deletions Monsoon/ChangeLog
@@ -1,3 +1,8 @@
2009-04-13 Alan McGovern <alan.mcgovern@gmail.com>

* MainWindow.cs: Ensure that the width/height is restored
correctly. Nuke some old CWLs.

2009-04-13 Alan McGovern <alan.mcgovern@gmail.com>

* Makefile.am:
Expand Down
11 changes: 6 additions & 5 deletions Monsoon/MainWindow.cs
Expand Up @@ -370,7 +370,6 @@ private void BuildTray()
trayMenu.Popup ();
};
TrayIcon.Tooltip = Defines.ApplicationName;
ShowAll ();
}

private void LoadAllSettings ()
Expand All @@ -390,8 +389,8 @@ private void RestoreInterfaceSettings ()
InterfaceSettings settings = interfaceSettings;

logger.Info ("Restoring interface settings");
SetDefaultSize (settings.WindowWidth, settings.WindowHeight);

Resize (settings.WindowWidth, settings.WindowHeight);
if (settings.WindowYPos == 0 && settings.WindowXPos == 0)
SetPosition (WindowPosition.Center);
else
Expand Down Expand Up @@ -497,6 +496,11 @@ private void BuildStatusBar()
item.Child = eventBox;
statusToolbar.Insert (item, 2);

sep = new SeparatorToolItem ();
sep.Draw = false;
sep.WidthRequest = 20;
statusToolbar.Insert (sep, 3);

statusToolbar.ShowAll ();
}

Expand Down Expand Up @@ -1148,12 +1152,10 @@ private void updateToolBar ()
startTorrentButton.Label = _("Start");
}
}
Console.WriteLine ("Style was: {0}. '{1}'/'{2}'", toolbar1.ToolbarStyle, InterfaceSettings.ToolbarStyle, InterfaceSettings.ToolbarStyleSystem);
if (InterfaceSettings.ToolbarStyle.HasValue)
toolbar1.ToolbarStyle = InterfaceSettings.ToolbarStyle.Value;
else
toolbar1.ToolbarStyle = InterfaceSettings.ToolbarStyleSystem;
Console.WriteLine ("Style is: {0}", InterfaceSettings.ToolbarStyle);
}

protected virtual void OnStartTorrentActivated (object sender, System.EventArgs e)
Expand Down Expand Up @@ -1336,7 +1338,6 @@ protected virtual void OnReportBugActivated (object sender, System.EventArgs e)

void OnPriorityLowest (object sender, System.EventArgs e)
{
Console.WriteLine ("Setting priority to: {0}", TorrentController.Torrents.Count);
TorrentController.SetPriority (TorrentController.SelectedDownload, TorrentController.Torrents.Count);
}

Expand Down

0 comments on commit 1c98ba2

Please sign in to comment.